Commits · c77fe253d87b073762d710e9a8ea35e639f3e49f · LMODroid / platform_packages_modules_Bluetooth

Jun 05, 2019

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state... · c77fe253

Ugo Yu authored 5 years ago

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: b5268c5b am: 286cfd69 -s ours
am: b6e53063 -s ours
am skip reason: subject contains skip directive

Change-Id: I2b8a32d29676a1ea7de1d26f700a5ac1930ea385

c77fe253

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: · b6e53063

Ugo Yu authored 5 years ago

am: 286cfd69 -s ours
am skip reason: change_id I8a98ba2178039e25c65fc701855066a8788312e6 with SHA1 add688f6 is in history

Change-Id: I03fe1c7c5a372fd126e9885a4412c2b63b138751

b6e53063

DO NOT MERGE Separate SDP procedure from bonding state (1/2) · 286cfd69
Ugo Yu authored 5 years ago
```
am: b5268c5b

Change-Id: I12aa00ba24326d58ce73f15b6ddc82f22201945e
```
286cfd69

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev... · 02c17f22

Ugo Yu authored 5 years ago

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev am: 0f2e2d82 am: 671587c3
am: a18404d3

Change-Id: I332b22ee718458d95df4e549238244f3117aa294

02c17f22

[automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from... · 9c4d027e

Ugo Yu authored 5 years ago

[automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee am: 12524682 am: dd272f55 am: 0a820c2c skipped: 8dc61493 am: cd5e720a am: 9ba77d4b
am: d1037680 -s ours
am skip reason: subject contains skip directive

Change-Id: Ice9aadfba47ba6e146de0123f17d7703b650605a

9c4d027e

DO NOT MERGE Separate SDP procedure from bonding state (1/2) · b5268c5b

Ugo Yu authored 5 years ago

- Do not stay in bonding state if the device is paried but still
  discovering service.
- Report BOND_BONDED to Java after authentication for a classic
  Bluetooth device is completed.
- Send BONDING event to Java when static identity address is
  first obtained during crosskey pairing
- Send BONDING event to Java for the initial random address
  before send BONDED event
- Do not send bond event for static identity address when SDP is done.
- Make sure pairing control block always get cleaned up when both SDP
  and pairing are done
- Send empty UUIDs to Java layer to unblock bonding intent broadcast
  when SDP fails

Bug: 79703832
Test: runtest bluetooth, regression test
Change-Id: I60d8883e6d095b440cce49686a2049c8b5660235
Merged-In: I8a98ba2178039e25c65fc701855066a8788312e6

b5268c5b

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev am: 0f2e2d82 · a18404d3
Ugo Yu authored 5 years ago
```
am: 671587c3

Change-Id: I5f81bb5a561e3da0a06d4d75f99f7894648b82d6
```
a18404d3

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:... · d1037680

Ugo Yu authored 5 years ago

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee am: 12524682 am: dd272f55 am: 0a820c2c skipped: 8dc61493 am: cd5e720a
am: 9ba77d4b

Change-Id: I548d7448fa6562b01ca6f8d7b63621f17679945c

d1037680

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev · 671587c3
Ugo Yu authored 5 years ago
```
am: 0f2e2d82

Change-Id: I7644ef835cc0177d110de369dfae0a01225bdcbb
```
671587c3

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am:... · 9ba77d4b

Ugo Yu authored 5 years ago

[automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee am: 12524682 am: dd272f55 am: 0a820c2c skipped: 8dc61493
am: cd5e720a

Change-Id: I13263a937d23bbfd624afcb92f5a4b76f240a258

9ba77d4b

Jun 04, 2019

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding... · 31815b81

Ugo Yu authored 5 years ago

[automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev
am: 0ecc542d -s ours
am skip reason: subject contains skip directive

Change-Id: I3bc81925f4a8a1f8d467d348fa5844fd1230cf6c

31815b81

[automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) · fe6f43da
Ugo Yu authored 5 years ago
```
am: add688f6 -s ours
am skip reason: subject contains skip directive

Change-Id: I09c517978113a8837c1cbccab61fa75eb7f199fd
```
fe6f43da
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev · 0ecc542d
TreeHugger Robot authored 5 years ago

0ecc542d
Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev · 970a11a0
TreeHugger Robot authored 5 years ago

970a11a0

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev · 0f2e2d82

TreeHugger Robot authored 5 years ago

* changes:
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee am: 12524682 am: dd272f55 am: 0a820c2c skipped: 8dc61493
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee am: 12524682 am: dd272f55 am: 0a820c2c
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee am: 12524682 am: dd272f55
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee am: 12524682
  [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee
  DO NOT MERGE Separate SDP procedure from bonding state (1/2)

0f2e2d82

Jun 03, 2019

[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for... · 5b2a1e6d

Martin Brabham authored 5 years ago

[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev am: 357a36f3 am: b3bdb9e3
am: 7db943f6 -s ours
am skip reason: subject contains skip directive

Change-Id: I10ca4405e203d9ecb9a31359410e57ac98db0db6

5b2a1e6d

[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks... · e57a7757

Martin Brabham authored 5 years ago

[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 9cd13ebc am: d7f9b193
am: 6c20cafa -s ours
am skip reason: subject contains skip directive

Change-Id: Ic13cb2ca31f5324e090f7d6d3de675f002a2724f

e57a7757

Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev am: 357a36f3 · 7db943f6
Martin Brabham authored 5 years ago
```
am: b3bdb9e3

Change-Id: I5fc2fe73c0d3a2ad34a3f6d320679b0920991940
```
7db943f6
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 9cd13ebc · 6c20cafa
Martin Brabham authored 5 years ago
```
am: d7f9b193

Change-Id: Ib6cbfeb4f468b1a4a3180cb4f52ad5ff316daff7
```
6c20cafa
Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev · b3bdb9e3
Martin Brabham authored 5 years ago
```
am: 357a36f3

Change-Id: Ib6aefc575fd54ec07d9f4ae3c25e12b44e05dd29
```
b3bdb9e3
DO NOT MERGE: btif: require pairing dialog for JustWorks SSP · d7f9b193
Martin Brabham authored 5 years ago
```
am: 9cd13ebc

Change-Id: I8f9c721a1c5186a579f95cdb1f44d0a8e5e14a87
```
d7f9b193
Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into pi-dev · 706a7f45
TreeHugger Robot authored 5 years ago

706a7f45
Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev · 357a36f3
TreeHugger Robot authored 5 years ago

357a36f3

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f" into oc-dev... · 66b2c4a0

Martin Brabham authored 5 years ago

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f" into oc-dev am: 033bd56c am: e5928261
am: 63af3c86

Change-Id: Icce93053514629dda42e58ee5628860d8aef8a78

66b2c4a0

[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks... · 0b7b8986

Martin Brabham authored 5 years ago

[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped: 8b2e81a7 am: 008c7ff7 am: 07432750
am: f5588536 -s ours
am skip reason: subject contains skip directive

Change-Id: Id99b668d45dd746544d10dde38b5e9a6049ef92d

0b7b8986

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f" into oc-dev am: 033bd56c · 63af3c86
Martin Brabham authored 5 years ago
```
am: e5928261

Change-Id: I91c17faf64d9dd53095296852c20790a074ff1ff
```
63af3c86

[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks... · f5588536

Martin Brabham authored 5 years ago

[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped: 8b2e81a7 am: 008c7ff7
am: 07432750

Change-Id: I3392b0dffc7f630ad2ebf06d817c717415c4c1d5

f5588536

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f" into oc-dev · e5928261
Martin Brabham authored 5 years ago
```
am: 033bd56c

Change-Id: Iff0fa054a3bb4a685e77f421d868ad26a457cfa2
```
e5928261

[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks... · 07432750

Martin Brabham authored 5 years ago

[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped: 8b2e81a7
am: 008c7ff7

Change-Id: I7e50b87b5a855fc3e0414699c3328933ed8c4ced

07432750

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f" into oc-dev · 033bd56c

TreeHugger Robot authored 5 years ago

* changes:
  [automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped: 8b2e81a7
  DO NOT MERGE: btif: require pairing dialog for JustWorks SSP

033bd56c

Merge changes from topic... · 9576dbc7

Martin Brabham authored 5 years ago

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev am: fc4c2fc0 am: 4fe4d537
am: 857b8fca

Change-Id: If1007452948d2c8567c00559a548413ca22f6a7c

9576dbc7

[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog... · a3edaf6b

Martin Brabham authored 5 years ago

[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 554f747b am: 5a7fb359 am: 6e506a46 am: a03d3eeb skipped: 66bb1914 am: f3efcd70 am: ddb2bf09
am: 6ccb5f66 -s ours
am skip reason: subject contains skip directive

Change-Id: I2d6ca7256b59316bc67772463a8ce618d4e0fef2

a3edaf6b

Merge changes from topic... · 857b8fca

Martin Brabham authored 5 years ago

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev am: fc4c2fc0
am: 4fe4d537

Change-Id: Ic94192cdb00bf8c7c3b151a3b43cf73aa88e56c6

857b8fca

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:... · 6ccb5f66

Martin Brabham authored 5 years ago

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 554f747b am: 5a7fb359 am: 6e506a46 am: a03d3eeb skipped: 66bb1914 am: f3efcd70
am: ddb2bf09

Change-Id: Ie6a3e110a1c32bfa02518d94e4426a300021690e

6ccb5f66

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev · 4fe4d537
Martin Brabham authored 5 years ago
```
am: fc4c2fc0

Change-Id: I40f15b86e59b389bb3fb8b5a061260d5976f7cbb
```
4fe4d537

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:... · ddb2bf09

Martin Brabham authored 5 years ago

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 554f747b am: 5a7fb359 am: 6e506a46 am: a03d3eeb skipped: 66bb1914
am: f3efcd70

Change-Id: Ia29d0d2bfeed91f75ab343953a09473c3442b958

ddb2bf09

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f-nyc-mr1-dev-nyc-dev" into oc-dev · fc4c2fc0

Martin Brabham authored 5 years ago

* changes:
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 554f747b am: 5a7fb359 am: 6e506a46 am: a03d3eeb skipped: 66bb1914
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 554f747b am: 5a7fb359 am: 6e506a46 am: a03d3eeb
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 554f747b am: 5a7fb359 am: 6e506a46
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 554f747b am: 5a7fb359
  [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 554f747b
  DO NOT MERGE: btif: require pairing dialog for JustWorks SSP

fc4c2fc0

May 31, 2019

[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog... · 7f9fb241

Martin Brabham authored 5 years ago

[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 999d4322 am: 1f76c7c3 skipped: 2f289cf2 am: ff7d514c am: 3d3735ba
am: d57482fc -s ours
am skip reason: subject contains skip directive

Change-Id: Iea59775e396c2eb224e7daa2f5532f15decb6c29

7f9fb241

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:... · d57482fc

Martin Brabham authored 5 years ago

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 999d4322 am: 1f76c7c3 skipped: 2f289cf2 am: ff7d514c
am: 3d3735ba

Change-Id: I04b90889c8186f3e21b73729e0e8f8cd1b6b2e3b

d57482fc

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am:... · 3d3735ba

Martin Brabham authored 5 years ago

[automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 999d4322 am: 1f76c7c3 skipped: 2f289cf2
am: ff7d514c

Change-Id: I8c85089522262e31ac3793184e34b28312750270

3d3735ba