OSDN Git Service
Treehugger Robot [Fri, 15 Apr 2016 20:10:35 +0000 (20:10 +0000)]
Merge "Rename btif audio_focus_state -> set_audio_focus_state." am:
93b6179
am:
c481822
* commit '
c481822da34ab6f8a566553fd73c337ab50c7e4b':
Rename btif audio_focus_state -> set_audio_focus_state.
Change-Id: I42d5f05d90d448116587973d1659772e91f9d304
Sanket Agarwal [Fri, 15 Apr 2016 20:07:17 +0000 (20:07 +0000)]
Merge "Rename btif audio_focus_state -> set_audio_focus_state."
am:
93b6179
* commit '
93b6179962049896cdbde0fb575d63e6482c5cb7':
Rename btif audio_focus_state -> set_audio_focus_state.
Change-Id: I54beae28905ba1b22c7a14dd424f045d560c712e
Treehugger Robot [Fri, 15 Apr 2016 19:57:21 +0000 (19:57 +0000)]
Merge "Rename btif audio_focus_state -> set_audio_focus_state."
Pavlin Radoslavov [Fri, 15 Apr 2016 19:20:04 +0000 (19:20 +0000)]
Add a missing null-pointer check in HeadsetService.stop()
am:
1b09c8c
* commit '
1b09c8cd4fa10c3f0918cb1e24bdd2fd60aeec88':
Add a missing null-pointer check in HeadsetService.stop()
Change-Id: I9c2c15ec6023d2a71ce9e00a156a9e891e69220b
Sanket Agarwal [Fri, 15 Apr 2016 19:10:01 +0000 (12:10 -0700)]
Rename btif audio_focus_state -> set_audio_focus_state.
Bug: b/
28065071
Change-Id: I0b84adfce2c72f03a81693e598c38e1469d7f022
Pavlin Radoslavov [Fri, 15 Apr 2016 17:49:41 +0000 (17:49 +0000)]
Merge "Add a missing null-pointer check in HeadsetService.stop()" am:
7f0f52c
am:
2144045
* commit '
214404558c638733aee9aec5a8481522ecaca86c':
Add a missing null-pointer check in HeadsetService.stop()
Change-Id: Ib80cb345580c497ae6352b80d299bb915c29c4d7
Pavlin Radoslavov [Fri, 15 Apr 2016 17:46:25 +0000 (17:46 +0000)]
Merge "Add a missing null-pointer check in HeadsetService.stop()"
am:
7f0f52c
* commit '
7f0f52c9c302ccb138d14cf60b782ea7e3a7cb51':
Add a missing null-pointer check in HeadsetService.stop()
Change-Id: I8f98d8282b66672af4cc6a2640364f12bcda6f97
Pavlin Radoslavov [Fri, 15 Apr 2016 00:49:45 +0000 (17:49 -0700)]
Add a missing null-pointer check in HeadsetService.stop()
Bug:
27678483
Change-Id: I288b905d6b3f827a94365d512305cd29e186f3d4
Pavlin Radoslavov [Fri, 15 Apr 2016 17:38:44 +0000 (17:38 +0000)]
Merge "Add a missing null-pointer check in HeadsetService.stop()"
Pavlin Radoslavov [Fri, 15 Apr 2016 00:49:45 +0000 (17:49 -0700)]
Add a missing null-pointer check in HeadsetService.stop()
Bug:
27678483
Change-Id: I288b905d6b3f827a94365d512305cd29e186f3d4
con [Thu, 14 Apr 2016 00:48:30 +0000 (00:48 +0000)]
Merge "Fix PEERS_MAC_ADDRESS permission for Ble Scanning." am:
a2129f1
am:
2369f00
* commit '
2369f00656165b339290879177c0b3104213bb9c':
Fix PEERS_MAC_ADDRESS permission for Ble Scanning.
Change-Id: Ib9d76c40e46b8bc95ca2beecaab9b6fb62084c0f
Calvin On [Thu, 14 Apr 2016 00:40:54 +0000 (00:40 +0000)]
Merge "Fix PEERS_MAC_ADDRESS permission for Ble Scanning."
am:
a2129f1
* commit '
a2129f1e4c73e4795627f4662a58b3d2d186848f':
Fix PEERS_MAC_ADDRESS permission for Ble Scanning.
Change-Id: I69f8fc96c4fc00bf18f4cb6daf79ca77ac1e9471
con [Thu, 14 Apr 2016 00:33:06 +0000 (00:33 +0000)]
Merge "Fix PEERS_MAC_ADDRESS permission for Ble Scanning."
Calvin On [Tue, 12 Apr 2016 22:43:59 +0000 (15:43 -0700)]
Fix PEERS_MAC_ADDRESS permission for Ble Scanning.
This changes the location permissions check to only throw a SecurityException
if *both* location and peers mac address permissions are missing.
Bug:
27837639
Change-Id: I5e10c8f0564d1f7edab23ad22dbd5aa5fdcbbf76
Calvin On [Wed, 13 Apr 2016 00:14:45 +0000 (00:14 +0000)]
Fix PEERS_MAC_ADDRESS permission for Ble Scanning.
am:
e041e1b
* commit '
e041e1b073d81516073223da4aef23e91cc823e7':
Fix PEERS_MAC_ADDRESS permission for Ble Scanning.
Change-Id: Ice6b8e751576badddcd814b8d9139af5d0ba387e
Calvin On [Tue, 12 Apr 2016 22:43:59 +0000 (15:43 -0700)]
Fix PEERS_MAC_ADDRESS permission for Ble Scanning.
This changes the location permissions check to only throw a SecurityException
if *both* location and peers mac address permissions are missing.
Bug:
27837639
Change-Id: I5e10c8f0564d1f7edab23ad22dbd5aa5fdcbbf76
Bill Yi [Sat, 9 Apr 2016 14:11:19 +0000 (14:11 +0000)]
Import translations. DO NOT MERGE
am:
b402d0b -s ours
* commit '
b402d0b9e87988703a8c90e724ee325c9f065e9c':
Import translations. DO NOT MERGE
Change-Id: If548343d3fb4ac13d6313870990971b9534da6a4
Bill Yi [Sat, 9 Apr 2016 13:51:28 +0000 (06:51 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33cceec5deb5b2f221c143167397a3ee0c60c332
Auto-generated-cl: translation import
Sanket Agarwal [Fri, 8 Apr 2016 00:28:54 +0000 (00:28 +0000)]
Bluetooth streaming should wait for AVRCP to start.
am:
f3db7dc
* commit '
f3db7dcf88a585d133f73b8579012f8217965728':
Bluetooth streaming should wait for AVRCP to start.
Change-Id: Id4a786f6b41e123d3bf4560fe21b8727d630cacd
Sanket Agarwal [Thu, 7 Apr 2016 18:56:26 +0000 (11:56 -0700)]
Bluetooth streaming should wait for AVRCP to start.
Currently we are waiting for A2DP to come up before we can start
streaming. This is not ideal since unless AVRCP comes up we cannot show
the UI reliably. That said, for compatibility with devices only having
A2DP we will need to modify this code. For now the A2DP SNK is only
supposed to work with AVRCP TG implementation on the remote.
Bug: b/
27744764
Change-Id: I972cf94f5b276d9b0e08315175ae605ccfe6a423
Marie Janssen [Thu, 7 Apr 2016 01:56:09 +0000 (01:56 +0000)]
Enable logging for AVRCP Metadata changes
am:
65e7943
* commit '
65e7943d098113c5aa56e9822b68f0c51c6dbe36':
Enable logging for AVRCP Metadata changes
Change-Id: I29e11f6f402c0b395e9a5dc3907554d085d1c02e
Marie Janssen [Thu, 7 Apr 2016 00:50:29 +0000 (00:50 +0000)]
Merge "Enable logging for AVRCP Metadata changes" am:
5faf9f0
am:
353e820
* commit '
353e820f5b64e26ea2b57ea997073e7616b55ad9':
Enable logging for AVRCP Metadata changes
Change-Id: I9cf01a6ac27e6939c43a3d577ec5ad1213379f45
Marie Janssen [Tue, 5 Apr 2016 17:49:19 +0000 (10:49 -0700)]
Enable logging for AVRCP Metadata changes
We're seeing a lot of AVRCP metadata issues, so enable some logging of
metadata in hopes of collecting more information.
Bug:
26837775
Bug:
27153373
Bug:
27178384
Bug:
27745277
Change-Id: Ie425ad2a5e090aa4363dab6b853479eeda35cef6
Marie Janssen [Wed, 6 Apr 2016 23:02:20 +0000 (23:02 +0000)]
Merge "Enable logging for AVRCP Metadata changes"
am:
5faf9f0
* commit '
5faf9f070da9165e5ccb87c3c1505af71d20b1e0':
Enable logging for AVRCP Metadata changes
Change-Id: I327d198160b37dd1d28f9364893c77b4adb928cb
Marie Janssen [Wed, 6 Apr 2016 22:53:41 +0000 (22:53 +0000)]
Merge "Enable logging for AVRCP Metadata changes"
Marie Janssen [Tue, 5 Apr 2016 17:49:19 +0000 (10:49 -0700)]
Enable logging for AVRCP Metadata changes
We're seeing a lot of AVRCP metadata issues, so enable some logging of
metadata in hopes of collecting more information.
Bug:
26837775
Bug:
27153373
Bug:
27178384
Bug:
27745277
Change-Id: Ie425ad2a5e090aa4363dab6b853479eeda35cef6
Bill Yi [Wed, 6 Apr 2016 17:26:02 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
8fc1976 -s ours
* commit '
8fc1976a9e898beb5cbfede708ee584ca2ca155e':
Import translations. DO NOT MERGE
Change-Id: I350d73755a499273cae70ce9f01808bc507c95b3
Bill Yi [Wed, 6 Apr 2016 17:07:53 +0000 (17:07 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Wed, 6 Apr 2016 13:38:59 +0000 (06:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I53e5b0bb59d7d67e82fc367bf8493c22deb594bb
Auto-generated-cl: translation import
Ajay Panicker [Wed, 6 Apr 2016 01:36:41 +0000 (01:36 +0000)]
Fix name collected for scan initiator
am:
f6f7432
* commit '
f6f74322ced5c6fb4681c2a1cb42c66f8c82c774':
Fix name collected for scan initiator
Change-Id: Ibf037410e2c599c6c22e57c14520d473da9cbcdd
Ajay Panicker [Tue, 5 Apr 2016 00:31:19 +0000 (17:31 -0700)]
Fix name collected for scan initiator
Private information was being collected for the scan statistics.
Bug:
27996307
Change-Id: Idab438967f80f86f4f92e7f03cc5787f8d54e8a1
Joseph Pirozzo [Wed, 6 Apr 2016 00:03:30 +0000 (00:03 +0000)]
Make PBAP PCE (Client) role auto-connectable.
am:
3c75851
* commit '
3c75851b93fe42d7d4650adc6a5d680c6f43eb42':
Make PBAP PCE (Client) role auto-connectable.
Change-Id: I759a1d25b65ee4f9dfe73e3c839d64e60a0ce206
Sanket Agarwal [Wed, 6 Apr 2016 00:03:30 +0000 (00:03 +0000)]
Change A2dpSinkService package from a2dp -> a2dpsink.
am:
eb47111
* commit '
eb471116243b322ee1574fd4dbf2b8e67e67a449':
Change A2dpSinkService package from a2dp -> a2dpsink.
Change-Id: Ie2bcba8553b9088bab66e18440e548bb7cbf2c46
Joseph Pirozzo [Tue, 5 Apr 2016 21:25:18 +0000 (14:25 -0700)]
Make PBAP PCE (Client) role auto-connectable.
Set the default flag to enable contact sharing from Car Kit by default
like the other autoconnect profiles.
Bug:
27977457
Change-Id: Ibbd09ea93ff402193e8a03ba77148dea9417a488
Ajay Panicker [Tue, 5 Apr 2016 23:40:37 +0000 (23:40 +0000)]
Merge "Fix name collected for scan initiator" am:
ca4d161
am:
033bfdb
* commit '
033bfdb04dbd5b6ad81421c9707c4dfe1e17e2d0':
Fix name collected for scan initiator
Change-Id: I94dbd95910ba84109dcf418561b05b185563e460
Ajay Panicker [Tue, 5 Apr 2016 23:37:22 +0000 (23:37 +0000)]
Merge "Fix name collected for scan initiator"
am:
ca4d161
* commit '
ca4d1610ade1c1e8b871b4abb04b00582049b75d':
Fix name collected for scan initiator
Change-Id: Icc000d8bd1e0142ff36addb192ed7121abfb198d
Ajay Panicker [Tue, 5 Apr 2016 23:29:18 +0000 (23:29 +0000)]
Merge "Fix name collected for scan initiator"
Ajay Panicker [Tue, 5 Apr 2016 00:31:19 +0000 (17:31 -0700)]
Fix name collected for scan initiator
Private information was being collected for the scan statistics.
Bug:
27996307
Change-Id: Idab438967f80f86f4f92e7f03cc5787f8d54e8a1
Sanket Agarwal [Tue, 5 Apr 2016 23:26:29 +0000 (16:26 -0700)]
Change A2dpSinkService package from a2dp -> a2dpsink.
Change go/ag/901764/ changed the package of A2dpSinkService but the JNI
did not do the appropriate change.
Bug:
27744764
Bug:
28025011
Change-Id: I9a6cc0e695bef152c1bdf461a5f92468db5172ab
Sanket Agarwal [Tue, 5 Apr 2016 23:08:59 +0000 (16:08 -0700)]
Merge commit '
92870384369a8a5345bfe868b97d2d384f433103' into manual_merge_9287038
Change-Id: I7696c00ff3787104caeeb22d7225e2ba665fa7f6
Sanket Agarwal [Thu, 31 Mar 2016 00:53:54 +0000 (17:53 -0700)]
Move MediaBrowserService to Bluetooth Process
MediaBrowserService exports A2DP streaming features to the rest of stack
using the MediaBrowser API. Currently it was being stareted by
BOOT_COMPLETE which made it start very late. Also that meant that some
of the broadcasts for the connection events is lost. Now it is started
by the A2DP state machine so that we do not miss any state changes.
Bug:
27744764
Change-Id: I193b4adfea09cbd90e41f1a217383b6aa234ef2b
Ajay Panicker [Tue, 5 Apr 2016 20:29:45 +0000 (20:29 +0000)]
Add GATT server scan stats and extra protection
am:
c473ba2
* commit '
c473ba2b2f5c8cad8c7f08f4a5d69594261bb736':
Add GATT server scan stats and extra protection
Change-Id: I8e99444e8b27d3d358a8d647beecbd35612ceb6d
Ajay Panicker [Wed, 23 Mar 2016 17:45:52 +0000 (10:45 -0700)]
Add GATT server scan stats and extra protection
Bug:
27811549
Change-Id: I9138193f8e0dec4e548c57b635bad3703961088f
Joseph Pirozzo [Mon, 4 Apr 2016 18:41:54 +0000 (18:41 +0000)]
Autoconnect Car Profiles
am:
79b693f
* commit '
79b693f44a0508d2a794635f0ec3bd84f8f5ede0':
Autoconnect Car Profiles
Change-Id: Ib739cd394017f58f4e54925d9eb67138f8d4b7ab
Joseph Pirozzo [Fri, 1 Apr 2016 23:51:31 +0000 (16:51 -0700)]
Autoconnect Car Profiles
Update profiles used in Car to enable and require PRIORITY_AUTO_CONNECT
to automatically connect when Adapter turns on.
Bug:
27899874
Change-Id: I33bf7cabe959b47954e3aced2af8a5ce8444b9ad
Sharvil Nanavati [Fri, 1 Apr 2016 20:40:51 +0000 (20:40 +0000)]
Merge "Fix NPE when performing BLE scans." am:
e5f0a8b
am:
f73e9eb
* commit '
f73e9eb0a9c303cc9b52f0a223aac24f7ac3abdf':
Fix NPE when performing BLE scans.
Change-Id: Ie8defd41ac5626d92e3a416fd53f5f7b131a4341
Sharvil Nanavati [Fri, 1 Apr 2016 20:36:07 +0000 (20:36 +0000)]
Merge "Fix NPE when performing BLE scans."
am:
e5f0a8b
* commit '
e5f0a8b1ea79947d49997eca37e0dcc93ef3fe33':
Fix NPE when performing BLE scans.
Change-Id: Iff12db132a291d121f7dd0bff8f26d2f7c9ae024
Ajay Panicker [Fri, 1 Apr 2016 20:27:21 +0000 (20:27 +0000)]
Merge "Fix NPE when performing BLE scans."
Sharvil Nanavati [Sat, 26 Mar 2016 00:03:53 +0000 (17:03 -0700)]
Fix NPE when performing BLE scans.
Bug:
27811549
Change-Id: I017b34745682dd9db5487921df5c01dfde93d67c
Alan Viverette [Thu, 31 Mar 2016 21:13:56 +0000 (21:13 +0000)]
Remove DayNight theme
am:
cb934fa
* commit '
cb934faec06f9269f34fb10f4fadb90b0bbf95dd':
Remove DayNight theme
Change-Id: I1459671927b9ed9fd41248f49177e20f7f2a73d5
Alan Viverette [Thu, 31 Mar 2016 20:18:44 +0000 (16:18 -0400)]
Remove DayNight theme
Bug:
21854466
Change-Id: Iebd75177ca302af975a76787a22fecf79a77ef26
Joseph Pirozzo [Wed, 30 Mar 2016 21:15:33 +0000 (21:15 +0000)]
Merge "PBAP client priority settings." into nyc-dev
am:
af98f39
* commit '
af98f39707768b300b29f552e29ec644e8f75dcd':
PBAP client priority settings.
Change-Id: I9c66454b97308b3bf6296e9ec45620dd5a4a17f3
Joseph Pirozzo [Wed, 30 Mar 2016 21:00:52 +0000 (21:00 +0000)]
Merge "PBAP client priority settings." into nyc-dev
Joseph Pirozzo [Fri, 25 Mar 2016 23:34:34 +0000 (16:34 -0700)]
PBAP client priority settings.
Implement get/setPriority for PbapClient such that the settings dialog
and connect at startup work appropriately.
Bug:
27642222
Change-Id: I9c02d4d08809c6cc4230c71031d880b3d09f0cc4
Pavlin Radoslavov [Wed, 30 Mar 2016 05:42:10 +0000 (05:42 +0000)]
Add a missing null check inside A2dpService.resetAvrcpBlacklist()
am:
f924b02
* commit '
f924b023dbe14a1183ca9d9688c38406e8717381':
Add a missing null check inside A2dpService.resetAvrcpBlacklist()
Change-Id: I4bd95c4795194e27f0bca7f254bf0e8226aed0e5
Pavlin Radoslavov [Tue, 29 Mar 2016 23:41:08 +0000 (16:41 -0700)]
Add a missing null check inside A2dpService.resetAvrcpBlacklist()
Add a missing null pointer check inside method
A2dpService.resetAvrcpBlacklist()
Also:
- Removed BondStateMachine.setProfilePriority() because it is
not used.
- Fix a typo "priorty" -> "priority"
- Fix a log message.
Bug:
27837879
Change-Id: Ieabf00d2ff1e49aa06598674f14e97eb9086d432
Pavlin Radoslavov [Wed, 30 Mar 2016 04:10:42 +0000 (04:10 +0000)]
Merge "Add a missing null check inside A2dpService.resetAvrcpBlacklist()" am:
855104e
am:
c9dfd16
* commit '
c9dfd167f599715f737c31b00ce0e15485c224d9':
Add a missing null check inside A2dpService.resetAvrcpBlacklist()
Change-Id: I7cd2bada2064d23984b7986efb0288b10e6879c8
Pavlin Radoslavov [Wed, 30 Mar 2016 04:06:54 +0000 (04:06 +0000)]
Merge "Add a missing null check inside A2dpService.resetAvrcpBlacklist()"
am:
855104e
* commit '
855104ede80487554482f04baecc107b14388f49':
Add a missing null check inside A2dpService.resetAvrcpBlacklist()
Change-Id: Ie77584c1477d2c226f40b408d4cff283aa9716dd
Pavlin Radoslavov [Wed, 30 Mar 2016 04:03:02 +0000 (04:03 +0000)]
Merge "Add a missing null check inside A2dpService.resetAvrcpBlacklist()"
Pavlin Radoslavov [Tue, 29 Mar 2016 23:41:08 +0000 (16:41 -0700)]
Add a missing null check inside A2dpService.resetAvrcpBlacklist()
Add a missing null pointer check inside method
A2dpService.resetAvrcpBlacklist()
Also:
- Removed BondStateMachine.setProfilePriority() because it is
not used.
- Fix a typo "priorty" -> "priority"
- Fix a log message.
Bug:
27837879
Change-Id: Ieabf00d2ff1e49aa06598674f14e97eb9086d432
Ajay Panicker [Tue, 29 Mar 2016 18:39:26 +0000 (18:39 +0000)]
Merge "Add GATT server scan stats and extra protection" am:
4e8da47
am:
25f233e
* commit '
25f233ebea0ec6cb46835d7c95185ddc6e980611':
Add GATT server scan stats and extra protection
Change-Id: Ida1ee11b2e57e38c3bd097c57b045bd30c3a5f23
Ajay Panicker [Tue, 29 Mar 2016 18:36:32 +0000 (18:36 +0000)]
Merge "Add GATT server scan stats and extra protection"
am:
4e8da47
* commit '
4e8da47eb282d16f9882abd236bdf01ecc79b93b':
Add GATT server scan stats and extra protection
Change-Id: I1666992815ac8426c6b8196776e5e274c537b373
Ajay Panicker [Tue, 29 Mar 2016 18:27:31 +0000 (18:27 +0000)]
Merge "Add GATT server scan stats and extra protection"
Ajay Panicker [Wed, 23 Mar 2016 17:45:52 +0000 (10:45 -0700)]
Add GATT server scan stats and extra protection
Bug:
27811549
Change-Id: I9138193f8e0dec4e548c57b635bad3703961088f
Ajay Panicker [Mon, 28 Mar 2016 22:32:59 +0000 (22:32 +0000)]
Revert "Add guest mode functionality (1/5)"
am:
fa08821
* commit '
fa0882174bb9479e307b6faea1d1c0f174d38f43':
Revert "Add guest mode functionality (1/5)"
Ajay Panicker [Mon, 28 Mar 2016 22:32:59 +0000 (22:32 +0000)]
Add guest mode functionality (1/5)
am:
6e2c4a1
* commit '
6e2c4a130d93e448decc67991690fd8d1f83a343':
Add guest mode functionality (1/5)
Ajay Panicker [Mon, 28 Mar 2016 21:58:49 +0000 (21:58 +0000)]
Revert "Add guest mode functionality (1/5)"
This reverts commit
6e2c4a130d93e448decc67991690fd8d1f83a343.
Change-Id: Iae9ecfc53a4e405bc04d21822a79112f7dc63247
Ajay Panicker [Fri, 18 Mar 2016 00:12:08 +0000 (17:12 -0700)]
Add guest mode functionality (1/5)
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: I561225652509b29ac6b0d194a3a50e29c5569365
Jakub Pawlowski [Mon, 28 Mar 2016 05:43:00 +0000 (05:43 +0000)]
GATT JNI - get_gatt_db_cb leaking local refs
am:
3178527
* commit '
31785275c1e2112a15cc1a966207bae0601ecd8a':
GATT JNI - get_gatt_db_cb leaking local refs
Andre Eisenbach [Mon, 28 Mar 2016 05:43:00 +0000 (05:43 +0000)]
Merge changes from topic \'pts-test-fix-sync-
20160335-1\' into nyc-dev
am:
4afd6b9
* commit '
4afd6b9c12b0cfa753b388b9eaace86692b4fc2f': (22 commits)
Fix more merge issues in BluetoothPbapVcardManager.java
PBAPS: Don't filter out DateTime when requested
PBAPS: Fix duplicate entries fetched from database
PBAPS: Get vcard when asked in alphabetical order
PBAPS: Enable contact search with full or part of given string
SAP: Fix ANR(s) in SAP server code
SAP: Remove sdp record while BT is being turned off to prevent leak
SAP: Fix issue of socket listener not getting re-started
SAP: Update UI connection and notifications properly
SAP: Handle disconnect request during call ongoing state
OPP: Update share status when interrupted at remote side.
OPP: Use long instead of int
MAP: Fix ANR for blocking operations on UI thread
MAP: Track ProfileState, register and unregister of BroadcastReceivers
MAP: CleanUp for SDP record in MAP Service shutdown
MAP: GETMessagesLisitng include mandatory field always.
MAP: Cleanup PendingIntent in cancelUserTimeoutAlarm.
MAP: Handle possible NPE while disconnect map.
MAP: Add MNS SDP Search during setNotificationRegistration.
MAP: Declare and fetch only 'INTERESTED_MESSAGE_TYPE_CLAUSE' MMS.
...
Jakub Pawlowski [Mon, 28 Mar 2016 04:40:12 +0000 (04:40 +0000)]
Merge "GATT JNI - get_gatt_db_cb leaking local refs"
am:
fd81a48
* commit '
fd81a4865f49b9d721015f1892e054cf622f5b5d':
GATT JNI - get_gatt_db_cb leaking local refs
Jakub Pawlowski [Thu, 24 Mar 2016 23:39:02 +0000 (16:39 -0700)]
GATT JNI - get_gatt_db_cb leaking local refs
Bug:
27835277
Change-Id: I4bd0beb763507ea8a4a43a0f707408757f6ce8e0
Andre Eisenbach [Mon, 28 Mar 2016 04:35:42 +0000 (04:35 +0000)]
Merge "GATT JNI - get_gatt_db_cb leaking local refs"
Andre Eisenbach [Mon, 28 Mar 2016 04:33:51 +0000 (04:33 +0000)]
Merge changes from topic 'pts-test-fix-sync-
20160335-1' into nyc-dev
* changes:
Fix more merge issues in BluetoothPbapVcardManager.java
PBAPS: Don't filter out DateTime when requested
PBAPS: Fix duplicate entries fetched from database
PBAPS: Get vcard when asked in alphabetical order
PBAPS: Enable contact search with full or part of given string
SAP: Fix ANR(s) in SAP server code
SAP: Remove sdp record while BT is being turned off to prevent leak
SAP: Fix issue of socket listener not getting re-started
SAP: Update UI connection and notifications properly
SAP: Handle disconnect request during call ongoing state
OPP: Update share status when interrupted at remote side.
OPP: Use long instead of int
MAP: Fix ANR for blocking operations on UI thread
MAP: Track ProfileState, register and unregister of BroadcastReceivers
MAP: CleanUp for SDP record in MAP Service shutdown
MAP: GETMessagesLisitng include mandatory field always.
MAP: Cleanup PendingIntent in cancelUserTimeoutAlarm.
MAP: Handle possible NPE while disconnect map.
MAP: Add MNS SDP Search during setNotificationRegistration.
MAP: Declare and fetch only 'INTERESTED_MESSAGE_TYPE_CLAUSE' MMS.
MAP: Synchronize notifcationReg reply and MNS connect action.
Send error for if VR is initiated during call.
Sharvil Nanavati [Sat, 26 Mar 2016 00:37:27 +0000 (00:37 +0000)]
Fix NPE when performing BLE scans.
am:
2a6d08a
* commit '
2a6d08a87c210918a0ad5b4c01bb5152cce2ba69':
Fix NPE when performing BLE scans.
Sharvil Nanavati [Sat, 26 Mar 2016 00:03:53 +0000 (17:03 -0700)]
Fix NPE when performing BLE scans.
Bug:
27811549
Change-Id: I017b34745682dd9db5487921df5c01dfde93d67c
Andre Eisenbach [Fri, 25 Mar 2016 21:39:40 +0000 (14:39 -0700)]
Fix more merge issues in BluetoothPbapVcardManager.java
Change-Id: I901042e69b3beea93684fe1a194353664fabd0c2
Smriti Gupta [Fri, 14 Aug 2015 11:18:48 +0000 (16:48 +0530)]
PBAPS: Don't filter out DateTime when requested
This only adds a special exception for DateTime,
the other "X-" fields are already filtered out since
for vcard 2.1, it is mandatory to provide DateTime
if requested by remote.
Change-Id: Ib25a9b085d5692548156068b9700e2b007c4bcee
Smriti Gupta [Mon, 30 Nov 2015 12:45:14 +0000 (18:15 +0530)]
PBAPS: Fix duplicate entries fetched from database
Precondition
================
Have multple contacts with either same number or name in DUT
Steps to reproduce:
===================
1. Perform BT pairing from DUT->RD<1>
2. Search for name from remote.
Expected Result:
================
Single entry with the name should be returned
Actual Result:
==============
Single name entry with different numbers are duplicating
Fix
========
This patch will remove the duplicate entries having same handle
and name fetched from the database sometimes. The check was
there in the stock code but that was not sufficient and was
comparing with the previous value only if these are duplicates
and not with the whole list. I have updated this check to
compare the fetched value if the exact duplicate value
(same ID and NAME) is present in the final list of contacts
which is to be returned.
Change-Id: If32526076baed813d39ce298c307196b63bc46fd
Hemant Gupta [Mon, 23 Nov 2015 11:08:05 +0000 (16:38 +0530)]
PBAPS: Get vcard when asked in alphabetical order
Precondition:
=============
- PSE should have atleast 40 contacts with all alphabetical permutations
Step by Step procedure:
=======================
1. Establish PBAP session. Navigate to "Browse" Tab
2. Select telecom/pb.vcf on remote device and select "SETPHONEBOOK"
3. Select "Get Size" from remote device
4. Select default sorting, maxlistcount = 5000 and click "Search" to
browse phonebook
5. Select "Alphabetical" sorting, maxlistcount = 5000 and click "Search"
to browse phonebook
Actual Result
============================
After alphabetical sorting the contacts are displayed according to index
but not with sorted request
Expected result:
=========================
When contacts are sorted according to alphabets the contact info should
also be displayed according to contacts.
Root Cause:
========================
While quering vcard entry from database, proper checks of the order (indexed/alphabetical)
was not there in M Stock code compared to L Stock code.
Change-Id: Ie7990992b4dd22add3526aa0050121e680567bb8
Hemant Gupta [Mon, 7 Mar 2016 08:12:52 +0000 (13:42 +0530)]
PBAPS: Enable contact search with full or part of given string
Enables searching of text in contact name starting with a given
matching string instead of matching the complete string.
Change-Id: I91258391b7b7cb014d55e17e1ed3b92267a2c7da
Hemant Gupta [Mon, 7 Mar 2016 07:16:04 +0000 (12:46 +0530)]
SAP: Fix ANR(s) in SAP server code
Fix ANR in SAP Server code in following scenarios:
- Multiple call to stop in Sapservice leads to ANR, as check was not
present in stop to prevent unregistering BroadcastReceiver if not
already registred.
- Remove redundant call to closeServerSocket from initSocket as this could
lead to ANR when there is simultaneous call to closeService as part of BT
being switched off and call to start SAP as part of BT being turned on when
BT on off sequence is tried repeatedly.
Change-Id: Ia6bc5ca7c9da9ae4a4c12e8207fb9ff6b9159e82
Hemant Gupta [Mon, 7 Mar 2016 07:11:14 +0000 (12:41 +0530)]
SAP: Remove sdp record while BT is being turned off to prevent leak
Remove sdp record created dynamically for SAP server during BT off state.
Without this call, there is leak in sdp layer in stack as sdp record is
never removed, even though the socket is closed.
Also proper checks are added to prevent call to remove sdp record when
adapter is null.
Change-Id: I739cc3115f6cd7fedf9085e8522c96da257e9568
Hemant Gupta [Mon, 7 Mar 2016 05:49:44 +0000 (11:19 +0530)]
SAP: Fix issue of socket listener not getting re-started
Add logic to properly handle ACL_DISCONNECTED to restart socketListener
to handle scenarios where socket listener was not getting started due to
abnormal ACL disconnect.
Change-Id: Iac5ec52f485e692b14bb0065e30a68cae007a49d
Hemant Gupta [Mon, 7 Mar 2016 05:39:41 +0000 (11:09 +0530)]
SAP: Update UI connection and notifications properly
Update connection state to upper layers only when SAP SLC is connected
i.e. status indication is sent to SAP Client.
Also notification to disconnect SAP Server from UI is shown only when SAP
is successfully connected, and not when SapServer object is created.
Change-Id: Iaf40584220b51f6193bed9a54d159cffd32698e9
Hemant Gupta [Mon, 7 Mar 2016 05:14:52 +0000 (10:44 +0530)]
SAP: Handle disconnect request during call ongoing state
Handle disconnect request during call ongoing state properly.
Previously if disconnect was received from SAP client while in
call ongoing state, it was not handled properly, leading to
Server not sending the DISCONNECT response thereby violating
Bluetooth SAP Specification.
Change-Id: I666fab4b4513abfa00df4be5b3a7aab95d5f0331
Hemant Gupta [Fri, 11 Sep 2015 11:34:52 +0000 (17:04 +0530)]
OPP: Update share status when interrupted at remote side.
Use case:
1) Select a file on DUT and send to Remote device through OPP
2) Accept the incoming file on Remote
3) While file transfer is in progress, stop the file transfer on Remote.
4) Again send the same file or different file to the same Remote Device.
Result:
OPP file transfer does not start.
Fix:
Update interrupted outbound content resolver entry when
Transfer is stopped at remote side. Otherwise DUT fails
To push OPP file after earlier OPP file is stopped on
Remote Device.
Change-Id: I9944bdd47ff9e31d0f9f8a157592e407e000e96c
Hemant Gupta [Thu, 10 Mar 2016 15:09:46 +0000 (20:39 +0530)]
OPP: Use long instead of int
Use long instead of int data type in OPP Java code to prevent
overflow of timestamp and filesize during transfer of large files
which caused transfer failures.
Change-Id: I58c9b49f59d47f6f162156eb6594e66731732580
Hemant Gupta [Fri, 11 Mar 2016 07:48:22 +0000 (13:18 +0530)]
MAP: Fix ANR for blocking operations on UI thread
UseCase:
Stability Testing steps followed:
1. Pair and connect with remote phone.
2. Verify successful profile connection.
3. Pair & Connect LE device.
4. Disconnect & Unpair LE device.
5. Reset BT multiple times.
6. Repeat above steps 50 times
Failure:
ANR(s) reported for long running operations perfromed on main thread.
Fix:
- Attach MAPService session handler to looper from a
worker thread to avoid long running tasks handling
for messages posted from UI thread.
- Move AppObserver Account onChange() handling
to worker thread instead of UI thread.
- Avoid running contentobserver for SMS/MMS instance on
main thread looper to fix ANR reported while handling
content changes for SMS and MMS listing. Add NPE checks
hit during stability testing.
Change-Id: Ie146cd284fd191f7c7be7f0c1e7ed4877b36ae76
Hemant Gupta [Fri, 11 Mar 2016 07:04:25 +0000 (12:34 +0530)]
MAP: Track ProfileState, register and unregister of BroadcastReceivers
Use Case:
1. Pair and connect with remote phone.
2. Verify successful profile connection.
3. Pair & Connect LE device.
4. Disconnect & Unpair LE device.
5. Reset BT multiple times.
6. Repeat above steps 50 times
Failure:
BT Crashed, failed to start MAP services after BT reset.
RootCause:
BT Crash for not handling following exceptions:
- java.lang.IllegalArgumentException: Receiver not registered
at: android.app.IntentReceiverLeaked: Service
com.android.bluetooth.map.BluetoothMapService
has leaked IntentReceiver com.android.bluetooth.map.BluetoothMapAppObserver:
Are you missing a call to unregisterReceiver()?
Fix:
- This issue is hit when onStop() for MAPService is triggered without onStart()
being triggered by the time shutdown process gets invoked.
- Track registration and unregistration for BluetoothMapAppObserver BroadcastReceiver
to fix IntentReceiver leaks and also added validation for the AppObserver Data.
Change-Id: Ia1c2160fef369bbff42e8da3ea7d925c483e0a12
Hemant Gupta [Fri, 11 Mar 2016 06:35:24 +0000 (12:05 +0530)]
MAP: CleanUp for SDP record in MAP Service shutdown
Remove SDP record per MAS Instance during MAP Service
shutdown procedure.
Add more relevant debug logging.
Change-Id: I222ad97d719b9a2c45db3ab8526dd3de9c553f3d
Hemant Gupta [Fri, 11 Mar 2016 05:41:33 +0000 (11:11 +0530)]
MAP: GETMessagesLisitng include mandatory field always.
Pre condition:
Atleast one SMS is present in any of the folders
with no subject.
UseCase:
1. Connect MAP connection from MCE to DUT
2. Set folder to Telecom/msg/inbox
3. Execute MessageListing with the required data
Failure:
Mandatory field "subject" is not included for few entries
in messagesListing.
Fix:
For GETMessagesLisitng ensure blank subject string is
set to include this mandatory feild and handle possible
"null" value fetched from database.
Change-Id: Ie29a61c83b22db9008184090a2f5b17d1f34b72b
Ashwini Munigala [Thu, 7 Jan 2016 12:30:58 +0000 (18:00 +0530)]
MAP: Cleanup PendingIntent in cancelUserTimeoutAlarm.
Handle cleanup for timeout Intent and pending Intent
in cancelUserTimeoutAlarm API.
Change-Id: I4f4184785675b2deffa3be8c9dd70b2673020b51
Ashwini Munigala [Tue, 27 Oct 2015 10:54:23 +0000 (16:24 +0530)]
MAP: Handle possible NPE while disconnect map.
Precondition:
Verified with IOT: MecApp in MCE role
UseCase:
1. Connect MAS
2. Register Mas Instance via MNS
3. Disconnect MAS
Failure:
Bluetooth App crash sometimes when disconnect map profile.
Root Cause:
The issue is hit when MAS disconnect is finished before MNS unregister.
In this case NullpointerException is happening because of clearing
BluetoothMapContentObserver already as a part of cleanup.
Fix:
Handle Null pointer exception while last
MAS instance disconnect is handled before MNS
unregistration.
Change-Id: I4e72038a5ddc6c3ac8c515def57cb4f98fe87675
Ashwini Munigala [Thu, 10 Sep 2015 13:02:05 +0000 (18:32 +0530)]
MAP: Add MNS SDP Search during setNotificationRegistration.
Precondition:
Verified with remote MCE device that starts MNS server
only before issuing setNotification Registration to MSE.
Use Case:
1. Discover and Pair with MSE from MCE.
2. Connect to MSE on Mas insance 0.
3. Enable Notification Registration for MAS Instance 0
Failure:
MNS connection happens over RFCOMM
and MAS Instance is connected over L2CAP.
Root Cause:
Current design performs MNS SDP search only at the time
of successful MAS Instance Connect. MNS connect implementation
tries connection over insecure RFCOMM channel based on UUID
when MNS Server record is not available.
Fix:
Add implementation to check and perform MNS SDP search
if this info is not available when MCE requests
setNotificationRegistration. This fix is required to
handle MCE implementation that start MNS Sever and
expose SDP only before sending setNotificationRegistration.
Change-Id: If1e8d33dcac078f04d13b8bacf8e1d1513c119e1
Hemant Gupta [Tue, 22 Dec 2015 13:27:58 +0000 (18:57 +0530)]
MAP: Declare and fetch only 'INTERESTED_MESSAGE_TYPE_CLAUSE' MMS.
Precondition:
Messaging App Settings configured to receive delivery reports for MMS.
Use Case:
Follow standard steps to perform messagesListing type MMS from MCE.
1. Connect to MSE on Mas instance 0.
2. Set Path to root.
3. Set Path to telecom.
4. Set Path to msg.
5. Set Path to inbox.
6. GET messagesListing type MMS.
Failure:
Extra entries like delivery reports that are stored in DB and
which are not user interested types are also included
in MSE messageListing for MMS type.
Fix:
OMA-TS-MMS-ENC MMS Standard defines many types in X-Mms-Message-Type.
Extra entries like delivery reports which is stored in DB are not
required to be shown to user, so these should be filtered, and
only m-send-req (128), m-retrieve-conf (132), m-notification-ind (130)
types should be fetched and shown to user in messageListing response.
This patch removes these unecessary message types from MMS Messaging Listing.
Change-Id: I1cb5d6e58477a32a89693f555a268e0855267b9a
Hemant Gupta [Mon, 21 Sep 2015 15:29:07 +0000 (20:59 +0530)]
MAP: Synchronize notifcationReg reply and MNS connect action.
Use Case:
1. Connect to carkit
2. Disconnect connection with carkit.
3. Reconnect to carkit
Failure:
MNS Failure during Reconnection.
User will in some timing conditions not get notification
of new messages and then turns OFF/ON the carkit.
MAS is connected fine but for MNS car sends BAD REQUEST.
Root Cause:
This isssue is reported only with one particular carkit in MCE role,
where in MNS Connect request issued before acknowleding
the setNotificationReg Request.
Fix:
Synchronize handleRegistration method in handler thread to ensure
setNotificationReg response from MSE is sent before requesting
a MNS Connect to MCE.
Change-Id: I30559c643af7733754fce551b97e31543a0cb160
Satish Kodishala [Fri, 29 Jan 2016 06:39:32 +0000 (12:09 +0530)]
Send error for if VR is initiated during call.
Use case:
Connect to BT headset.
Make a call. Let the call audio be on BT headset.
Initiate voice recognition(VR) from BT headset.
Failure:
AG is not sending error for VR when initiated during call.
Headset might go into bad state if AG don't send error.
Rootcause:
AG is not sending error for VR when initiated during call.
Fix:
When VR is activated during call, send error response to headset.
Change-Id: Ib12d464fc6a6948ddf22250a65a9e5bfeb4a8fb1
Jakub Pawlowski [Thu, 24 Mar 2016 23:39:02 +0000 (16:39 -0700)]
GATT JNI - get_gatt_db_cb leaking local refs
Bug:
27835277
Change-Id: I4bd0beb763507ea8a4a43a0f707408757f6ce8e0
Andre Eisenbach [Wed, 23 Mar 2016 21:14:26 +0000 (14:14 -0700)]
Fixed merge error in BluetoothPbapVcardManager.java
Change-Id: Idf60aae9a94527479e3cc9c9552fc19ec15a396c