OSDN Git Service
Pavlin Radoslavov [Wed, 25 May 2016 00:26:49 +0000 (00:26 +0000)]
Merge "Removed unnecessary "synchronized" statements" am:
5d573d5b69
am:
58ae9847b3
* commit '
58ae9847b35b4a5d20f82b02ba396eb3d7790a99':
Removed unnecessary "synchronized" statements
Change-Id: I97f18ab10590fe10f1cfa2deeae915f447e6de23
Pavlin Radoslavov [Tue, 24 May 2016 23:27:50 +0000 (23:27 +0000)]
Merge "Removed unnecessary "synchronized" statements"
am:
5d573d5b69
* commit '
5d573d5b69dd6b339a2f26627065e4398266d072':
Removed unnecessary "synchronized" statements
Change-Id: I9c5750be40991984dfc9a8415618f24d519a1048
Treehugger Robot [Tue, 24 May 2016 23:17:36 +0000 (23:17 +0000)]
Merge "Removed unnecessary "synchronized" statements"
Ajay Panicker [Tue, 24 May 2016 22:27:40 +0000 (22:27 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea am:
46790a61d3 am:
5b68598a5f am:
4b1a2258f7
am:
996e934491
* commit '
996e934491359a490a95f510da6f9eca6e684918':
Add guest mode functionality (3/3)
Change-Id: Icb7cf37c3be37ad276a678a26c5008126937c7fa
Ajay Panicker [Tue, 24 May 2016 22:26:53 +0000 (22:26 +0000)]
Add guest mode functionality (3/3) am:
af5b1764da am:
69689c0098 -s ours am:
1d6901fdcf am:
749752db0d
am:
24bbc49362
* commit '
24bbc4936234ba42ef38c14d0f7c2174b98b1792':
Add guest mode functionality (3/3)
Change-Id: I1f07c3966954139f49a49d2f39cee93130b91343
Ajay Panicker [Tue, 24 May 2016 22:26:00 +0000 (22:26 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea am:
46790a61d3 am:
5b68598a5f
am:
4b1a2258f7
* commit '
4b1a2258f7b811312ddefb1af62a87544f574ab1':
Add guest mode functionality (3/3)
Change-Id: I0a69c7db93c9f510985107e31609c9b45dc3698f
Ajay Panicker [Tue, 24 May 2016 22:25:26 +0000 (22:25 +0000)]
Add guest mode functionality (3/3) am:
af5b1764da am:
69689c0098 -s ours am:
1d6901fdcf
am:
749752db0d
* commit '
749752db0d737e47f59347f01e9c304608f63e27':
Add guest mode functionality (3/3)
Change-Id: I8e8327d41c0ee3d6b6ed1c68b7517aca44dfab66
Ajay Panicker [Tue, 24 May 2016 22:21:47 +0000 (22:21 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea am:
46790a61d3
am:
5b68598a5f
* commit '
5b68598a5f4e0bef1ee87671617be8476dbf30a6':
Add guest mode functionality (3/3)
Change-Id: Ib4ea170b03af67655426ab030032aeb36342f6ba
Ajay Panicker [Tue, 24 May 2016 22:21:27 +0000 (22:21 +0000)]
Add guest mode functionality (3/3) am:
af5b1764da am:
69689c0098 -s ours
am:
1d6901fdcf
* commit '
1d6901fdcf7e546b3bdbeb1bc1b9c1cae3688745':
Add guest mode functionality (3/3)
Change-Id: If3aaa4e34c015da99d38e984d8b0dd1bedd2e1f3
Ajay Panicker [Tue, 24 May 2016 22:16:17 +0000 (22:16 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours am:
6d74162bea
am:
46790a61d3
* commit '
46790a61d3722128f68bbfd2e12656923def72d0':
Add guest mode functionality (3/3)
Change-Id: I956eb988a5f80ff11af426a406251a852eb1a09a
Ajay Panicker [Tue, 24 May 2016 22:16:04 +0000 (22:16 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002 am:
0b2a403b82 -s ours
am:
6d74162bea
* commit '
6d74162bea2771991a434e0c463b58c080ee1b26':
Add guest mode functionality (3/3)
Change-Id: I90e7d0a5372f25eeb2a92f8773aa81caa3d1de1f
Ajay Panicker [Tue, 24 May 2016 22:15:53 +0000 (22:15 +0000)]
Add guest mode functionality (3/3) am:
af5b1764da
am:
69689c0098 -s ours
* commit '
69689c0098a7582f8bba393f72b2575ed5508e71':
Add guest mode functionality (3/3)
Change-Id: I0715575a2e7de20356c1b8c0b170eb85eb5e77e3
Ajay Panicker [Tue, 24 May 2016 22:13:11 +0000 (22:13 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641 am:
b01d679002
am:
0b2a403b82 -s ours
* commit '
0b2a403b821149b8d0c6ec3ab28db46beff3d75e':
Add guest mode functionality (3/3)
Change-Id: Ic32d37360b9a73b10b27bed3a73d9fdf865db346
Ajay Panicker [Tue, 24 May 2016 22:07:27 +0000 (22:07 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6 am:
480b762641
am:
b01d679002
* commit '
b01d6790028caf2ba951d5c6eeacf7d4f8ecbbd3':
Add guest mode functionality (3/3)
Change-Id: I98de45cdc87a200c4ff32ccfac88d42edac767a5
Ajay Panicker [Tue, 24 May 2016 22:05:26 +0000 (22:05 +0000)]
Add guest mode functionality (3/3) am:
e1ca5cccd6
am:
480b762641
* commit '
480b76264134b6a44aef6948f32b4bd6a62fcd0f':
Add guest mode functionality (3/3)
Change-Id: I512cef0d0c23d4702cf9de61be4bf8f47c164bac
Ajay Panicker [Tue, 24 May 2016 22:02:02 +0000 (22:02 +0000)]
Add guest mode functionality (3/3)
am:
af5b1764da
* commit '
af5b1764daa3b212d471f000d7091ac07c040453':
Add guest mode functionality (3/3)
Change-Id: I2591d37bb52e2bda796200100f7f21bf00f55d7a
Ajay Panicker [Tue, 24 May 2016 22:02:02 +0000 (22:02 +0000)]
Add guest mode functionality (3/3)
am:
e1ca5cccd6
* commit '
e1ca5cccd6c2b37f783aa0ee2d9371108ad5c855':
Add guest mode functionality (3/3)
Change-Id: I9f3c034215aadf5e5ebd77e4a3265c7fbcf21fe3
Pavlin Radoslavov [Mon, 23 May 2016 05:24:08 +0000 (22:24 -0700)]
Removed unnecessary "synchronized" statements
Bug:
28734075
Bug:
28799467
Change-Id: I6ba8867c179dc416bb0dd06c69ce426c10ea7585
(cherry picked from commit
e741f05c93343241123095acab011dc8a0700bc6)
Pavlin Radoslavov [Tue, 24 May 2016 02:34:35 +0000 (02:34 +0000)]
Removed unnecessary "synchronized" statements
am:
e741f05c93
* commit '
e741f05c93343241123095acab011dc8a0700bc6':
Removed unnecessary "synchronized" statements
Change-Id: Id0e12a4367d43f056a04ed8d877adbb2b1735424
Pavlin Radoslavov [Mon, 23 May 2016 05:24:08 +0000 (22:24 -0700)]
Removed unnecessary "synchronized" statements
Bug:
28734075
Bug:
28799467
Change-Id: I6ba8867c179dc416bb0dd06c69ce426c10ea7585
venkata Jagadeesh [Mon, 23 May 2016 21:46:17 +0000 (21:46 +0000)]
Broadcast UUIDS on BT state transition to ON
am:
6fb4b2407f
* commit '
6fb4b2407f2ae6d87b1f026870f66d717a915973':
Broadcast UUIDS on BT state transition to ON
Change-Id: I9794b2e85406f0b031dc28aa9a7002b5d334b1a7
Andre Eisenbach [Mon, 23 May 2016 21:43:01 +0000 (21:43 +0000)]
Merge "Fix LocalRef leakage in get_gatt_db" am:
1e881716b5
am:
e6a0f4bcdb
* commit '
e6a0f4bcdbf480ffc7172a4c1691e526ad20016d':
Fix LocalRef leakage in get_gatt_db
Change-Id: I8c5fdeb549d91169c463025f6b66adff98536cfa
venkata Jagadeesh [Tue, 12 Jan 2016 09:24:47 +0000 (14:54 +0530)]
Broadcast UUIDS on BT state transition to ON
Use case: Phone and media connection is not happening
after BT reset during swapping between the HeadSet.
Precondition:
1. WIFI should be on and connected with AP.
Steps:
1. Pair and connect from DUT to PLT legend device.
2. Make an Mobile originated (MO) call.
3. Pair and connect from DUT to sony carkit.
4. Swap connection between PLT legend and sony carkit.
5. During swapping turn OFF BT from DUT.
6. Turn ON DUT and wait for auto connection from DUT.
7. Repeat step from 4-6 10 times.
Failure: Failed to connect with HS.
Root cause:
Broadcarst UUIDS on receiving the on event
from lower layers even though the state is not
transitioned to ON.
Fix:
Broadcast UUIDS on BT state is transitioned to ON
to avoid timing issues related UUIDS.
Bug:
27665220
Change-Id: Ibdbaecd60cf36c599700b1ca353481b8149efa90
Jakub Pawlowski [Mon, 23 May 2016 21:38:44 +0000 (21:38 +0000)]
Merge "Fix LocalRef leakage in get_gatt_db"
am:
1e881716b5
* commit '
1e881716b58792a5f40f9a89c30e2282de8e4c71':
Fix LocalRef leakage in get_gatt_db
Change-Id: Ie58a139002cc747d9403588a39e3bb5fca80903c
Andre Eisenbach [Mon, 23 May 2016 21:30:30 +0000 (21:30 +0000)]
Merge "Fix LocalRef leakage in get_gatt_db"
Jakub Pawlowski [Mon, 23 May 2016 18:05:32 +0000 (11:05 -0700)]
Fix LocalRef leakage in get_gatt_db
Bug:
28878699
Change-Id: I81929d9f802d4f50eb7eb60d54ceca6ff19bb651
Jakub Pawlowski [Mon, 23 May 2016 20:48:14 +0000 (20:48 +0000)]
Fix LocalRef leakage in get_gatt_db
am:
c949f68641
* commit '
c949f686413deb9b711696d53d8064669a1475d0':
Fix LocalRef leakage in get_gatt_db
Change-Id: I12661dd596ba08898c747097cf5fb0687f11a714
Pavlin Radoslavov [Mon, 23 May 2016 20:09:29 +0000 (20:09 +0000)]
Merge "Initialize variable protocolMode before it is used" am:
c5d9328731
am:
60491bc07b
* commit '
60491bc07b6042df817c1c70b2eb7b6884c68fc4':
Initialize variable protocolMode before it is used
Change-Id: I488faa4484474980b2754b2c95221d282c0c78de
Pavlin Radoslavov [Mon, 23 May 2016 20:05:30 +0000 (20:05 +0000)]
Merge "Initialize variable protocolMode before it is used"
am:
c5d9328731
* commit '
c5d9328731a7ef2b7c9ad37b89541c714325cb06':
Initialize variable protocolMode before it is used
Change-Id: Iffb4cc051808316ee16a1796858812006449bc3f
Treehugger Robot [Mon, 23 May 2016 19:58:30 +0000 (19:58 +0000)]
Merge "Initialize variable protocolMode before it is used"
Jakub Pawlowski [Mon, 23 May 2016 18:05:32 +0000 (11:05 -0700)]
Fix LocalRef leakage in get_gatt_db
Bug:
28878699
Change-Id: I81929d9f802d4f50eb7eb60d54ceca6ff19bb651
Ajay Panicker [Fri, 18 Mar 2016 00:12:08 +0000 (17:12 -0700)]
Add guest mode functionality (3/3)
Add a flag to enable() to start Bluetooth in restricted
mode. In restricted mode, all devices that are paired during
restricted mode are deleted upon leaving restricted mode.
Right now restricted mode is only entered while a guest
user is active.
Bug:
27410683
Change-Id: If4a8855faf362d7f6de509d7ddc7197d1ac75cee
Pavlin Radoslavov [Mon, 23 May 2016 18:33:59 +0000 (11:33 -0700)]
Initialize variable protocolMode before it is used
This fixes a compilation warning.
Note that the variable protocolMode is unused by the backend.
Bug:
28908173
Change-Id: I6925a974ec825db8cfda694f7f5a30aa9919552d
Baligh Uddin [Sun, 22 May 2016 23:13:09 +0000 (23:13 +0000)]
Import translations. DO NOT MERGE
am:
b3ddda59b6 -s ours
* commit '
b3ddda59b674623296238121a6e81c3c1e434756':
Import translations. DO NOT MERGE
Change-Id: I72013e16cc8e49e6a26f12ec3eaf193014722f29
Baligh Uddin [Sat, 21 May 2016 19:12:24 +0000 (12:12 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
28857042
Change-Id: I7d9aa50ddc3826c10cf29aa91e3fae9ee79a1004
Ajay Panicker [Sat, 21 May 2016 02:40:28 +0000 (02:40 +0000)]
Change scan downgrade timeout from 5 min to 30 min
am:
63d9d9ffbe
* commit '
63d9d9ffbec2facf7b90aa552e37168e66c497eb':
Change scan downgrade timeout from 5 min to 30 min
Change-Id: I786d70bde87b53c91c42aa80db103e9651e68404
Ajay Panicker [Sat, 21 May 2016 01:58:57 +0000 (01:58 +0000)]
Merge "Change scan downgrade timeout from 5 min to 30 min" am:
31c02c5a77
am:
b292cb0ad3
* commit '
b292cb0ad3070f7ba869d9acc5fe2623d43d9e60':
Change scan downgrade timeout from 5 min to 30 min
Change-Id: I6882ad07b4a67f245d1e8aa76ab9e731a8d70a95
Ajay Panicker [Sat, 21 May 2016 01:56:25 +0000 (01:56 +0000)]
Merge "Change scan downgrade timeout from 5 min to 30 min"
am:
31c02c5a77
* commit '
31c02c5a770c0c12becb0856b2c7132470a49939':
Change scan downgrade timeout from 5 min to 30 min
Change-Id: I7659aec283d8046b7fdb2fc669f20661a42fa014
Treehugger Robot [Sat, 21 May 2016 01:50:48 +0000 (01:50 +0000)]
Merge "Change scan downgrade timeout from 5 min to 30 min"
Ajay Panicker [Sat, 21 May 2016 00:35:12 +0000 (17:35 -0700)]
Change scan downgrade timeout from 5 min to 30 min
Bug:
28824606
Change-Id: Ic4d1f7832aaa33ce0177905f6a64fea8eb048eae
Ajay Panicker [Sat, 21 May 2016 00:35:12 +0000 (17:35 -0700)]
Change scan downgrade timeout from 5 min to 30 min
Bug:
28824606
Change-Id: Ic4d1f7832aaa33ce0177905f6a64fea8eb048eae
Andre Eisenbach [Thu, 19 May 2016 21:11:57 +0000 (21:11 +0000)]
Merge "Fix 2 instances of a field being assigned itself in a constructor." am:
f28ab8051e
am:
b3ad81b75a
* commit '
b3ad81b75a5c6b3fad86413982f2d0a24fd63d01':
Fix 2 instances of a field being assigned itself in a constructor.
Change-Id: Id39ce8ca220feb0acda18ef455a00ac05a92a9e5
Ian Rogers [Thu, 19 May 2016 21:11:56 +0000 (21:11 +0000)]
Merge "Fix a test related to GATT client that could never succeed" am:
128622ac45
am:
e28292e65a
* commit '
e28292e65a93c866efc767a88137bfe601b9b3e9':
Fix a test related to GATT client that could never succeed
Change-Id: I443a006993bf575ac1e569fe445b0c4662da6c5a
Ian Rogers [Thu, 19 May 2016 21:09:29 +0000 (21:09 +0000)]
Merge "Fix 2 instances of a field being assigned itself in a constructor."
am:
f28ab8051e
* commit '
f28ab8051e96c47d71f34794fcfd1e26652792c3':
Fix 2 instances of a field being assigned itself in a constructor.
Change-Id: Ib1a2473a9b33febc783bccf7b234a5f76ca652a5
Ian Rogers [Thu, 19 May 2016 21:09:26 +0000 (21:09 +0000)]
Merge "Fix a test related to GATT client that could never succeed"
am:
128622ac45
* commit '
128622ac456566192f86b7027e376a61fd4ac41c':
Fix a test related to GATT client that could never succeed
Change-Id: Ic4bce3c9e35d3ee32435719a6bb9bfbc957c0acd
Andre Eisenbach [Thu, 19 May 2016 21:00:19 +0000 (21:00 +0000)]
Merge "Fix 2 instances of a field being assigned itself in a constructor."
Ian Rogers [Wed, 16 Mar 2016 21:08:39 +0000 (14:08 -0700)]
Fix 2 instances of a field being assigned itself in a constructor.
The code had no effect so its safe to remove.
The issue was identified using error prone.
Bug:
27723540
Change-Id: I3803573c545c00e8066ba185c271b38a75bf28c6
Treehugger Robot [Thu, 19 May 2016 20:58:22 +0000 (20:58 +0000)]
Merge "Fix a test related to GATT client that could never succeed"
Ian Rogers [Thu, 19 May 2016 02:40:49 +0000 (19:40 -0700)]
Fix a test related to GATT client that could never succeed
Caught by Error Prone:
warning: [CollectionIncompatibleType] Argument 'clientIf' should not be
passed to this method; its type int is not compatible with its
collection's type argument AdvertiseClient.
Bug:
27723540
Change-Id: I395b17a46c3734afd0f49866b7aa0bd0f1c6cef4
Alain Vongsouvanh [Wed, 18 May 2016 16:21:03 +0000 (16:21 +0000)]
DO NOT MERGE ANYWHERE GATT: Move connection parameters to config.xml am:
26f325ad37 -s ours am:
6bc72a1fbf -s ours
am:
4457205c96 -s ours
* commit '
4457205c9640ce31ee5afb9c934bc45de5555a2a':
DO NOT MERGE ANYWHERE GATT: Move connection parameters to config.xml
Change-Id: I0c67c434d298653fc8cec828ead7a6bf985b32fa
Alain Vongsouvanh [Wed, 18 May 2016 16:17:59 +0000 (16:17 +0000)]
DO NOT MERGE ANYWHERE GATT: Move connection parameters to config.xml am:
26f325ad37 -s ours
am:
6bc72a1fbf -s ours
* commit '
6bc72a1fbfb09856983589e5bb19ba5bf67e7e94':
DO NOT MERGE ANYWHERE GATT: Move connection parameters to config.xml
Change-Id: I8a04e5f7269be7242cfdedf071319d1947e4be7e
Alain Vongsouvanh [Wed, 18 May 2016 16:15:29 +0000 (16:15 +0000)]
DO NOT MERGE ANYWHERE GATT: Move connection parameters to config.xml
am:
26f325ad37 -s ours
* commit '
26f325ad37145b0de56518f63c97319e322c976b':
DO NOT MERGE ANYWHERE GATT: Move connection parameters to config.xml
Change-Id: Ibe39628179845b7dd1c16604bcb78614eb397474
Zach Johnson [Wed, 18 May 2016 01:47:48 +0000 (01:47 +0000)]
Merge "GATT: Move connection parameters to config.xml" am:
7eb11d6593
am:
a85495cfc5
* commit '
a85495cfc5516ba5c931ebc947994cbd617bdb93':
GATT: Move connection parameters to config.xml
Change-Id: I65e24c1044eb9f6fad8ad71a3dd70d26d88a7292
Alain Vongsouvanh [Wed, 18 May 2016 01:45:12 +0000 (01:45 +0000)]
Merge "GATT: Move connection parameters to config.xml"
am:
7eb11d6593
* commit '
7eb11d6593464d50793615a1b67c8ae7cd91a984':
GATT: Move connection parameters to config.xml
Change-Id: I3b8542aa1768659ecad36b2660cc5980255a5348
Alain Vongsouvanh [Fri, 13 May 2016 20:27:59 +0000 (13:27 -0700)]
DO NOT MERGE ANYWHERE GATT: Move connection parameters to config.xml
This makes it easier for OEMs to customize the high prioriy, balanced
and low power mode connection parameters through overlays.
Bug:
18013697
Change-Id: I8b486b772fdb871f2800238cb5e45c4ff0663952
(cherry-picked from
d65009d591017319a429be1a920fdf763e71cebd)
Zach Johnson [Wed, 18 May 2016 01:36:54 +0000 (01:36 +0000)]
Merge "GATT: Move connection parameters to config.xml"
Alain Vongsouvanh [Fri, 13 May 2016 20:27:59 +0000 (13:27 -0700)]
GATT: Move connection parameters to config.xml
This makes it easier for OEMs to customize the high prioriy, balanced
and low power mode connection parameters through overlays.
Bug:
18013697
Change-Id: I8b486b772fdb871f2800238cb5e45c4ff0663952
Matadeen Mishra [Tue, 17 May 2016 18:37:28 +0000 (18:37 +0000)]
Merge "GATT: Fix FD leak caused by GATT profile" am:
0a689a6645
am:
4ae09f60b6
* commit '
4ae09f60b64da7052a08e52834790fc56ffa7bf6':
GATT: Fix FD leak caused by GATT profile
Change-Id: I71bb1fb45e1411f99c679fa78a86fe6adda563d1
Matadeen Mishra [Tue, 17 May 2016 18:34:40 +0000 (18:34 +0000)]
Merge "GATT: Fix FD leak caused by GATT profile"
am:
0a689a6645
* commit '
0a689a66458459eb7353e899d20e591a28cc895f':
GATT: Fix FD leak caused by GATT profile
Change-Id: If0e2fb0684ded784e6b113587ec5f070684b4a2b
Treehugger Robot [Tue, 17 May 2016 18:19:52 +0000 (18:19 +0000)]
Merge "GATT: Fix FD leak caused by GATT profile"
venkata Jagadeesh [Tue, 17 May 2016 18:08:22 +0000 (18:08 +0000)]
Merge "Broadcast UUIDS on BT state transition to ON" am:
8980266333
am:
30cc572e2b
* commit '
30cc572e2b84520bbba1626217ea244db2d81bef':
Broadcast UUIDS on BT state transition to ON
Change-Id: I90244d201d8c36ea56a171804e2048dabf43a4e5
venkata Jagadeesh [Tue, 17 May 2016 18:05:03 +0000 (18:05 +0000)]
Merge "Broadcast UUIDS on BT state transition to ON"
am:
8980266333
* commit '
8980266333518f4a771dc2dd16c0be10f38279fd':
Broadcast UUIDS on BT state transition to ON
Change-Id: I70fbc968a6d9fa5600865b528cb29d51124f1147
Treehugger Robot [Tue, 17 May 2016 17:57:53 +0000 (17:57 +0000)]
Merge "Broadcast UUIDS on BT state transition to ON"
Matadeen Mishra [Wed, 12 Nov 2014 02:54:41 +0000 (18:54 -0800)]
GATT: Fix FD leak caused by GATT profile
Use case: BT ON/OFF with one BLE APP active
Failure: FD leak is observed with ON/OFF stress test
which eventually lead to crash due to unavailability
of FDs.
Steps:
BT ON/OFF with one BLE APP active to retain the
same Bluetooth process ID to check the FD leak issue.
Root Cause: As the Advertisementi manager and Scan
Manager are not cleaning up the looper instances as
part of cleanup, it causes FD leak.
Fix: Cleanup the handler threads in Advertisementmanager
and ScanManager so that there are no resource leaks.
Change-Id: Ia51899f449d57c1ef68a9516b8472d1fd492572b
Andre Eisenbach [Tue, 17 May 2016 17:04:31 +0000 (17:04 +0000)]
Merge "Stop profile services when Bluetooth enable times out" am:
c21f27c021
am:
3665bc03f9
* commit '
3665bc03f9eb42d390d9e97325655898cc605ffd':
Stop profile services when Bluetooth enable times out
Change-Id: I14cc19c3fc1b0a09f446f05669b84e6b3b34722e
Srinu Jella [Tue, 17 May 2016 17:01:30 +0000 (17:01 +0000)]
Merge "Stop profile services when Bluetooth enable times out"
am:
c21f27c021
* commit '
c21f27c0210bb23da10a8d269b98fa3aa5fa4a6f':
Stop profile services when Bluetooth enable times out
Change-Id: I303b4ecd10bd960564802a8978690a11443c0a33
venkata Jagadeesh [Tue, 12 Jan 2016 09:24:47 +0000 (14:54 +0530)]
Broadcast UUIDS on BT state transition to ON
Use case: Phone and media connection is not happening
after BT reset during swapping between the HeadSet.
Precondition:
1. WIFI should be on and connected with AP.
Steps:
1. Pair and connect from DUT to PLT legend device.
2. Make an Mobile originated (MO) call.
3. Pair and connect from DUT to sony carkit.
4. Swap connection between PLT legend and sony carkit.
5. During swapping turn OFF BT from DUT.
6. Turn ON DUT and wait for auto connection from DUT.
7. Repeat step from 4-6 10 times.
Failure: Failed to connect with HS.
Root cause: Broadcarst UUIDS on receiving the on event
from lower layers even though the state is not
transitioned to ON.
Fix: Broadcast UUIDS on BT state is transitioned to ON
to avoid timing issues related UUIDS.
Change-Id: Ibdbaecd60cf36c599700b1ca353481b8149efa90
Andre Eisenbach [Tue, 17 May 2016 16:51:30 +0000 (16:51 +0000)]
Merge "Stop profile services when Bluetooth enable times out"
Srinu Jella [Thu, 3 Mar 2016 07:42:11 +0000 (13:12 +0530)]
Stop profile services when Bluetooth enable times out
While moving from OFF to BLE_ON state, we are able to switch
BLE_TURNING_ON state which starts the enable_timeout timer. After timing
out we are stopping profiles other than BLE which may still be active
and can send callbacks while clean-up is in process or complete.
Bug:
27678483
Change-Id: I75d88024a60967fb516ebd0941e8e216d00c20f6
Adam Lesinski [Thu, 12 May 2016 01:26:14 +0000 (01:26 +0000)]
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
am:
fc57cab5ba
* commit '
fc57cab5ba191752d0091c808f940fb677bac0ab':
BluetoothManager: Make requestControllerActivityInfo one call
Change-Id: I99a1a7b15e9f8c733abed28daf75692cd56afac9
Adam Lesinski [Thu, 12 May 2016 00:59:28 +0000 (00:59 +0000)]
Merge "BluetoothManager: Make requestControllerActivityInfo one call" into nyc-dev
Harshavardhan Nalajala [Wed, 11 May 2016 23:49:05 +0000 (23:49 +0000)]
Merge "Correct message length calculation while sending SMS" am:
65f3adbe57
am:
42d14017b0
* commit '
42d14017b05650397b6c5133d09b040aa2012e4c':
Correct message length calculation while sending SMS
Change-Id: Ie7299ec9ae3b03fb72b1a35cbc5cfd96d47be6dc
Harshavardhan Nalajala [Wed, 11 May 2016 23:45:52 +0000 (23:45 +0000)]
Merge "Correct message length calculation while sending SMS"
am:
65f3adbe57
* commit '
65f3adbe5770791b7182057dbac6ea2fb04285fe':
Correct message length calculation while sending SMS
Change-Id: I94ce84c8460a62b7c768fb242a2fdc36abc24f80
Treehugger Robot [Wed, 11 May 2016 23:38:07 +0000 (23:38 +0000)]
Merge "Correct message length calculation while sending SMS"
Harshavardhan Nalajala [Mon, 31 Aug 2015 08:28:08 +0000 (13:58 +0530)]
Correct message length calculation while sending SMS
Messages are supposed to be sent with correct
length which is obtained from the "LENGTH:" field
in the line received. Current implementation
is sending a message with invalid length causing
NegativeNumberException when the message is read.
Change-Id: Ieb4239562f8d049ee001ebc547105df44ee70f08
Bryce Lee [Tue, 10 May 2016 23:52:49 +0000 (23:52 +0000)]
Add config for enabling HFP Connection Service.
am:
70c7604401
* commit '
70c760440149a0ac78ff33346798253269abd937':
Add config for enabling HFP Connection Service.
Change-Id: Ia20de8cc2355d4a9f2e28cb75f429f4b90e26b57
Bryce Lee [Mon, 9 May 2016 20:52:14 +0000 (13:52 -0700)]
Add config for enabling HFP Connection Service.
By default, devices which use HFP Client profile should use the built-in
connection service. However, the service should be flexible enough to
allow other implementations.
Bug:
28068989
Change-Id: Ic1be5745541ccfbd838c5440e4cfc75620ae91c2
Adam Lesinski [Tue, 10 May 2016 21:03:03 +0000 (14:03 -0700)]
BluetoothManager: Make requestControllerActivityInfo one call
Instead of making multiple calls into the Bluetooth service,
make one call that can timeout. This helps prevent cases
when the Bluetooth process hangs and the system_server is calling into
it and causes a WATCHDOG restart.
Bug:
28658141
Change-Id: I84d2c025f4ffb452975444e794a64c82569deb0a
Lianchao Song [Tue, 10 May 2016 17:49:30 +0000 (17:49 +0000)]
DO NOT MERGE ANYWHERE Add missing null pointer check inside HeadSetClientService.stop() am:
3fe282a78e -s ours am:
8080442c99 -s ours
am:
432f43c938 -s ours
* commit '
432f43c938cc59e64b1e8130e5873357dae90769':
DO NOT MERGE ANYWHERE Add missing null pointer check inside HeadSetClientService.stop()
Change-Id: I854e44089aa6f68b88e358103981df5f7cbc0dc3
Lianchao Song [Tue, 10 May 2016 17:46:49 +0000 (17:46 +0000)]
DO NOT MERGE ANYWHERE Add missing null pointer check inside HeadSetClientService.stop() am:
3fe282a78e -s ours
am:
8080442c99 -s ours
* commit '
8080442c99578192d91eb8fcc23ac9cc0c805587':
DO NOT MERGE ANYWHERE Add missing null pointer check inside HeadSetClientService.stop()
Change-Id: Id550b4448b5f3eab200c519e347e876579a4cc4c
Lianchao Song [Tue, 10 May 2016 17:43:58 +0000 (17:43 +0000)]
DO NOT MERGE ANYWHERE Add missing null pointer check inside HeadSetClientService.stop()
am:
3fe282a78e -s ours
* commit '
3fe282a78e8643329c5d6bc84ad5788cd4366b70':
DO NOT MERGE ANYWHERE Add missing null pointer check inside HeadSetClientService.stop()
Change-Id: I376d9ee987ce3c1d859fbc78095cc85ea78475fa
Ajay Panicker [Mon, 9 May 2016 23:23:22 +0000 (23:23 +0000)]
Merge "Allow scan statistics to be displayed even if app hasn\'t scanned." am:
a3a090a40f
am:
ca85ab538c
* commit '
ca85ab538ceb7184420cdd7d3c2a2a278664e95e':
Allow scan statistics to be displayed even if app hasn't scanned.
Change-Id: Ibcfcbaf9cb3af2f73f15b4a3ea105156d0f867dc
Chenjie Luo [Mon, 9 May 2016 22:37:32 +0000 (15:37 -0700)]
resolve merge conflicts of
45a85cf to nyc-dev-plus-aosp
Change-Id: I0b676ca373047044981d241ea305703354fd01b7
Ajay Panicker [Mon, 9 May 2016 21:49:21 +0000 (21:49 +0000)]
Merge "Allow scan statistics to be displayed even if app hasn\'t scanned."
am:
a3a090a40f
* commit '
a3a090a40fa97301da43e9d6f5d7bf57f714e802':
Allow scan statistics to be displayed even if app hasn't scanned.
Change-Id: I95e68739adea8b8967e12d15f36c00c02f10d904
Treehugger Robot [Mon, 9 May 2016 21:41:55 +0000 (21:41 +0000)]
Merge "Allow scan statistics to be displayed even if app hasn't scanned."
Lianchao Song [Mon, 9 May 2016 21:27:46 +0000 (21:27 +0000)]
Merge "Add missing null pointer check inside HeadSetClientService.stop()"
am:
08c145a06c
* commit '
08c145a06c0eb63940863461a475f9261f06f55c':
Add missing null pointer check inside HeadSetClientService.stop()
Change-Id: Icacba58aa147af14ca2b52c0f2d3d0f6f033d5de
Lianchao Song [Mon, 9 May 2016 14:50:57 +0000 (22:50 +0800)]
DO NOT MERGE ANYWHERE Add missing null pointer check inside HeadSetClientService.stop()
Bug:
28664857
Change-Id: I62abc4eb4127db2d4f0cde44eca618996f099b49
Signed-off-by: Lianchao Song <songlianchao@huawei.com>
Chenjie Luo [Mon, 9 May 2016 21:08:14 +0000 (21:08 +0000)]
Merge "Add missing null pointer check inside HeadSetClientService.stop()"
Ajay Panicker [Mon, 9 May 2016 19:22:04 +0000 (19:22 +0000)]
Add protection against LE scanning abuse
am:
aef39f16e4
* commit '
aef39f16e48cbae0ace8136c3235136c0a096061':
Add protection against LE scanning abuse
Change-Id: I9724b7048901381f3afb88ede6fdb8f0da8f69a5
Lianchao Song [Mon, 9 May 2016 14:50:57 +0000 (22:50 +0800)]
Add missing null pointer check inside HeadSetClientService.stop()
Bug:
28664857
Change-Id: I62abc4eb4127db2d4f0cde44eca618996f099b49
Signed-off-by: Lianchao Song <songlianchao@huawei.com>
Ajay Panicker [Wed, 13 Apr 2016 21:11:57 +0000 (14:11 -0700)]
Add protection against LE scanning abuse
Added two checks to prevent abuse. The first check ensures that an
app doesn't scan too frequently in a certain time period. It is
allowed to scan again after its oldest scan exceedes said time
period. The second check ensures that an app doesn't scan for too
long. Upon starting a scan, this code waits a certain amount of time.
If the app is still scanning by that point, this code stops
the scan and forces the app to use opportunistic scanning instead.
Bug:
27357274
Change-Id: Ic99ac1f838e15ed99fe2fae643ef073d74b5c96b
Sanket Agarwal [Mon, 9 May 2016 17:34:24 +0000 (17:34 +0000)]
HfpClientConnectionService does not synchronize state
am:
a8fc504fed
* commit '
a8fc504fed7dcb5dc074980b9d4cfa7a56445424':
HfpClientConnectionService does not synchronize state
Change-Id: I433578eed7e085681b7d124232ee27bd838f427a
Ajay Panicker [Fri, 6 May 2016 03:07:08 +0000 (20:07 -0700)]
Allow scan statistics to be displayed even if app hasn't scanned.
Bug:
28622714
Change-Id: I220d3110346e7d6f67ecfd7468779072d71b5788
Sanket Agarwal [Tue, 26 Apr 2016 22:35:43 +0000 (15:35 -0700)]
HfpClientConnectionService does not synchronize state
Currently active device is a synchronizable state and the current
implementation was simply waiving it. Also the mechanism to create a
phone account was invalid since the PhoneAccountHandle was not unique
per device. PhoneAccountHandle not being unique is OK for now but fails
in case of multiple devices.
Bug: b/
28068989
Change-Id: I729df5aa110a428b8ce23cf6658d81c5acbc16a2
Ajay Panicker [Fri, 6 May 2016 23:10:04 +0000 (16:10 -0700)]
Merge commit '
98691c26ecdaf8689739966b1aeeaa54f3fd1eb2' into manual_merge_98691c2
Change-Id: I57aeffc87caa6da75773d811eb929d9c2aeca13d
Ajay Panicker [Fri, 6 May 2016 22:22:26 +0000 (22:22 +0000)]
Merge "Add protection against LE scanning abuse"
am:
9a7e72caee
* commit '
9a7e72caee9b4cd029667f2077e5f27024fdb0f2':
Add protection against LE scanning abuse
Change-Id: I2dbe24ef46b9ad36f412b9586ecbfdbcc324d829
Treehugger Robot [Fri, 6 May 2016 22:10:49 +0000 (22:10 +0000)]
Merge "Add protection against LE scanning abuse"
Ajay Panicker [Wed, 13 Apr 2016 21:11:57 +0000 (14:11 -0700)]
Add protection against LE scanning abuse
Added two checks to prevent abuse. The first check ensures that an
app doesn't scan too frequently in a certain time period. It is
allowed to scan again after its oldest scan exceedes said time
period. The second check ensures that an app doesn't scan for too
long. Upon starting a scan, this code waits a certain amount of time.
If the app is still scanning by that point, this code stops
the scan and forces the app to use opportunistic scanning instead.
Bug:
27357274
Change-Id: Ic99ac1f838e15ed99fe2fae643ef073d74b5c96b
Marie Janssen [Fri, 6 May 2016 18:53:49 +0000 (18:53 +0000)]
AVRCP: Provide more media attributes
am:
0fcd081ccc
* commit '
0fcd081cccbf624a3a886fe4eb68adc3498e695c':
AVRCP: Provide more media attributes
Change-Id: I0bb3438288534aee9bdfb30a359872560e302804
Hua Song [Thu, 5 May 2016 21:09:26 +0000 (21:09 +0000)]
Merge "OPP: Use addFlags() instead of setFlags() when adding flags to the ACTION_VIEW intent" am:
5df2915a97
am:
01bdd183c2
* commit '
01bdd183c2b0bda4814399e94fc967cb1cfe8794':
OPP: Use addFlags() instead of setFlags() when adding flags to the ACTION_VIEW intent
Change-Id: Ib4a753745884510afa83705c9adc281dd6846b51
OSDN Git Service
