summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-10.0.0_r37' into ↵lineage-17.1Kevin F. Haggerty2020-06-01117-378/+1236
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | staging/lineage-17.1_merge-android-10.0.0_r37 Android 10.0.0 Release 37 (QQ3A.200605.001) * tag 'android-10.0.0_r37': (37 commits) Import translations. DO NOT MERGE Revert "PBAP server, send favorite contacts" Import translations. DO NOT MERGE Delete call logs when calls are made without PBAP Set Browsing bit to 0 in PbapSupportedFeatures Prevent phone's bd_addr from appearing in Accounts Return an empty list when the requested node is not in the tree AvrcpController Test update AVRCP Controller Media Controller not ready Allow subsequent requests for media keys to replay the silent audio sample HFP Client call status update PBAP server, send favorite contacts AVRCP Controller Disable Automatic Focus Request A2DP Sink: Focus gain while transient loss AVRCP Controller State without Browsing Add bluetooth prefs for Android Automotive MAP Client disconnect state machine if MAS client disconnected MAP Client close connection on MNS disconnect MAP Client Only connect MNS in connected state MAP Client BMessage parser length ... Change-Id: I1398f4ffe79e4ac0a37765927e4afd2e05ee0908
| * Snap for 6362707 from a7d25af6f9dab4de4a283da8ebb63e88782dfce3 to ↵android-build-team Robot2020-04-0385-3/+85
| |\ | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: Ie380933e0066ff69c081747bdccf18d72cdff955
| | * Import translations. DO NOT MERGEBill Yi2020-04-0285-3/+85
| | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I0148d54752958a93d6c9ac521ee4108fea4d1cf1
| * | Snap for 6324712 from 1cab5971b821ce69e8968c8c660ba8b54c4eca21 to ↵android-build-team Robot2020-03-232-0/+26
| |\| | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: I40cd88196839294bd3ddbd48dfdb481bea4efdff
| | * Merge "Block guest user from Bluetooth tethering connect/disconnect" into ↵TreeHugger Robot2020-03-232-0/+26
| | |\ | | | | | | | | | | | | qt-qpr1-dev
| | | * Block guest user from Bluetooth tethering connect/disconnectTed Wang2020-03-052-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guset user does not have permission to change WiFi network, block guest user to connect WiFi through Bluetooth thethering to secure it. Bug: 126206353 Test: atest BluetoothInstrumentationTests Merged-In: Id863513f2e6b4bfa7ab56446e2a77389348e8934 Change-Id: Id863513f2e6b4bfa7ab56446e2a77389348e8934 (cherry picked from commit 312202c1d75013d55cc3fad6a333445a91dfd4ce)
| * | | Snap for 6317653 from fdb60fa1e62f4c097bf8bff6001d1afa83020871 to ↵android-build-team Robot2020-03-207-86/+61
| |\| | | | | | | | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: If7e164045b504f0cd43015590bdd85d4be2ad289
| | * | Merge changes I305b3231,I2fcd959a,I31dec95f into qt-qpr1-devJoseph Pirozzo2020-03-203-3/+38
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Delete call logs when calls are made without PBAP Set Browsing bit to 0 in PbapSupportedFeatures Prevent phone's bd_addr from appearing in Accounts
| | | * | Delete call logs when calls are made without PBAPAndrew Cheng2020-03-161-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PbapClientConnectionHandler has code to remove calllogs when PBAP disconnects. However, if PBAP was never connected/enabled in the first place, and calls are made over HFP, these calllogs will not be removed when the device disconnects. This CL ensures calllogs are still removed in this case. Bug: 143723278 Test: (1) Verifying call logs are removed: Connect phone to carkit without enabling PBAP (e.g., don't allow permissions during pairing). Place a phone call over Bluetooth. Examine the calllog database directly: "sqlite3 calllog.db .dump” to verify call entry is present. Disconnect Bluetooth from the phone. Examine database again to verify entry is deleted. Repeat by disconnecting from the carkit, as well as disconnecting only HFP. (2) Verifying only HFP call logs are removed: Connect phone to carkit, with PBAP enabled this time. Place a phone call over HFP. Disable HFP profile, leaving PBAP enabled. Verify the HFP-entry is removed from calllog.db, while the PBAP-entries are still present. Change-Id: I305b323194f7732967db9a086d2c8a689798e64d Merged-In: I305b323194f7732967db9a086d2c8a689798e64d (cherry picked from commit f74a94dff84681645d2e519122b626bd5c4fe7fa)
| | | * | Set Browsing bit to 0 in PbapSupportedFeaturesAndrew Cheng2020-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PbapClient currently doesn't support browsing. This CL sets the bit to zero in PbapSupportedFeatures to accurately reflect the functionalities. Bug: 139624050 Test: Check the snoop/HCI logs. Look under the OBEX protocol header of the connection request packet for PBAP. Under Application Parameters > PbapSupportedFeatures, verify the Browsing bit is now 0. Change-Id: I2fcd959abf6aba178cd5fffb2f6e69cf1863fd89 Merged-In: I2fcd959abf6aba178cd5fffb2f6e69cf1863fd89 (cherry picked from commit 522d6cb1d42b80b64a51645105ec5bb0b561a5e9)
| | | * | Prevent phone's bd_addr from appearing in AccountsAndrew Cheng2020-03-161-2/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bluetooth's pbapclient needs to create an Account to help manage the syncing of phonebook contacts and call logs. This Bluetooth-generated Account will show up in Settings > Accounts, leading to a confusing and poor user experience. This CL will prevent this Account from appearing. This fix relies on the fact that getAccountPreferences in AccountListPreferenceController will skip showing any Account that has a null 'label'. Bug: 131857089 Test: Verify in Settings > Accounts that the phone's bd_addr is no longer listed. Change-Id: I31dec95f3cd2d66f2f1b1c9bf80cb9c3031b585b Merged-In: I31dec95f3cd2d66f2f1b1c9bf80cb9c3031b585b (cherry picked from commit 8ff121fce067ffae9f76610f276a3bd88e110b87)
| | * | Merge "Fix bluetooth can't turn off during network reset (1/3)" into qt-qpr1-devTreeHugger Robot2020-03-201-1/+0
| | |\ \
| | | * | Fix bluetooth can't turn off during network reset (1/3)weichinweng2020-03-091-1/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove disable Bluetooth action from AdapterService and move to BluetoothManagerService. Bug: 110181479 Test: manual Change-Id: Iaaa82675f072406970afc97ebe754b29f28d9490 Merged-In: Iaaa82675f072406970afc97ebe754b29f28d9490
| | * | Merge "Revert "PBAP server, send favorite contacts"" into qt-qpr1-devTreeHugger Robot2020-03-193-82/+23
| | |\ \
| | | * | Revert "PBAP server, send favorite contacts"Joseph Pirozzo2020-03-193-82/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit da1dc71cffb5fbb1e55186a20410e3d4f95246c3. Reason for revert: Not intended for this build. Change-Id: I3d8f51080e377d5dc7b67395a4979b8e5937a181
| * | | | Snap for 6313343 from 360a06de6878ed38fa2ebf973843140e3b3920ab to ↵android-build-team Robot2020-03-1929-384/+1133
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: I29803dae9e248bb3a0dc9d2651477d451670ecde
| | * | | Merge changes from topic "AutomotiveQBTSync" into qt-qpr1-devJoseph Pirozzo2020-03-1929-384/+1133
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Return an empty list when the requested node is not in the tree AvrcpController Test update AVRCP Controller Media Controller not ready Allow subsequent requests for media keys to replay the silent audio sample HFP Client call status update PBAP server, send favorite contacts AVRCP Controller Disable Automatic Focus Request A2DP Sink: Focus gain while transient loss AVRCP Controller State without Browsing Add bluetooth prefs for Android Automotive MAP Client disconnect state machine if MAS client disconnected MAP Client close connection on MNS disconnect MAP Client Only connect MNS in connected state MAP Client BMessage parser length MAP Client support incomming MMS PBAP client, download favorite contacts AVRCP MediaBrowserService support ACTION_PREPARE AVRCP Controller onSkipToQueueItem invalid AVRCP Controller getCurrentCalls NPE AVRCP Controller transient loss while idle AVRCP Controller request focus when idle AVRCP Controller AbsoluteVolumeNotification Splitting over-the-air downloading into batches Use Calendar.Builder for MAP Client timestamp parsing AVRCP Controller Shuffle/Repeat support Broadcast MAP Client messages oldest first DO NOT MERGE: Revert "AVRCP Controller AbsoluteVolumeNotification" DO NOT MERGE: Revert "AVRCP Controller transient loss while idle" This revert is reapplied after a few CLs to match change order to AOSP.
| | | * | | Return an empty list when the requested node is not in the treeSal Savage2020-03-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes it so a request for the data in a folder that doesn't exist always returns promptly. Prior to this, all requests would hang indefinitely instead. This is only a stand in for a future solution to send a null result through the media framework instead. Unfortunately, our structure needs some tweaking to make that work. This will be fine for the interim. Bug: 148604797 Test: Build, flash, browse deep into a tree, switch players to invalid that parents of the node you're on, try browsing upward. See that we return an empty list for all missing nodes. Change-Id: Ifd5ed106d3b46377f0d7cd2d1e565cde45ab06f9 Merged-In: Ifd5ed106d3b46377f0d7cd2d1e565cde45ab06f9
| | | * | | AvrcpController Test updateJoseph Pirozzo2020-03-161-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve test failures by use of mocked resource overlays. Two tests were failing: - testPlaybackWhileMusicPlaying - testPlaybackWhileIdle Bug: 147432575 Test: atest AvrcpControllerStateMachineTest Change-Id: Id71a7e50bb00d0cc9b15f84a9bfd913a8320fc7e (cherry picked from commit 56ea19154bb0669e5e91e5578e68163a6b2643ee) Merged-In: Id71a7e50bb00d0cc9b15f84a9bfd913a8320fc7e Change-Id: Ife2945b8cf314d35425ffb51c37f94fdc3a18257
| | | * | | AVRCP Controller Media Controller not readyJoseph Pirozzo2020-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flip two lines of code to ensure that the media controller is set before updating the available actions. Prevents a race condition where a media player responds to a media state change before the controller is available. Bug: 147469352 Test: Inspection (And many on off cycles) Change-Id: I2aad90c1028ab0ca81da09233e7fb49bf18d89c9 (cherry picked from commit 64d01153446c3751085a848a63e155285bb52805) Merged-In: I2aad90c1028ab0ca81da09233e7fb49bf18d89c9 Change-Id: Ieac01f46658d8e426666b8b316caf69d31fc4c5a
| | | * | | Allow subsequent requests for media keys to replay the silent audio sampleSal Savage2020-03-161-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: b/146010863 Test: Build, flash, interopt test with hard key events using automotive hardware. Change-Id: I4943c9f79011a1ee315fd3178af9171444dffa0b (cherry picked from commit f43be3b331a4a5575f2bbd4d631531c1f17e17fe) Merged-In: I4943c9f79011a1ee315fd3178af9171444dffa0b Change-Id: I8ef5ff15c3570fc98b80a1bfe8f750d7eaa5d32f
| | | * | | HFP Client call status updateJoseph Pirozzo2020-03-161-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a call is terminating only inform telecom about its termination when there is an actual state change from the attached phone. Bug: 138753272 Test: start and end call, observe logs from HfpClientDeviceBlock that a closing call still in its previous state doesn't get destroyed prematurely. Change-Id: Ia5d105daa239f64b73c058d064c2e5181d862e4e (cherry picked from commit c1f83b71f34d101c023db154607c8ea50218214f) Merged-In: Ia5d105daa239f64b73c058d064c2e5181d862e4e Change-Id: I5d9d59c64bc8a79b397d2d4ef6feef1320345f42
| | | * | PBAP server, send favorite contactsAndrew Cheng2020-03-163-23/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 132636859 Test: ACTS/SL4A and PTS Change-Id: I57326dfafe898187477b524b0fe03b181292dda9 (cherry picked from commit 131e778204a9143ad27793a341f4e13925b7d44a) Merged-In: I57326dfafe898187477b524b0fe03b181292dda9 Change-Id: Icfa9a81d9aaf4ddad35e51b5410b8b367d820160
| | | * | AVRCP Controller Disable Automatic Focus RequestJoseph Pirozzo2020-03-161-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove automatic focus requests when isMusicActive returns false as there are too many edge cases in behavior to work well. Bug: 144507838 Test: Attempt to play media from connected device while no audio is active Change-Id: I547d195012c56dc73029ef59ed24bbfe7d536646 (cherry picked from commit 7bf3489331e9b645c3692f9f86beb108a1a0e874) Merged-In: I547d195012c56dc73029ef59ed24bbfe7d536646 Change-Id: I5870c92a24d1501bd10162d28a3dde5e83b26251
| | | * | A2DP Sink: Focus gain while transient lossJoseph Pirozzo2020-03-162-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While Bluetooth is under a transient focus loss if the user presses the play button, Bluetooth should attempt to regain audio focus rather than just wait passive for the transient holder to release it. Bug: 143916073 Test: atest A2dpSinkStreamHandlerTest Change-Id: I7b958a9ff06c9f1fcb9383a3a40ca147f4ad9399 (cherry picked from commit 97e20beea72e7b717465cb280ef576f5f2e29711) Merged-In: I7b958a9ff06c9f1fcb9383a3a40ca147f4ad9399 Change-Id: I78dfe8917d02c4b9d71d82db4fae586f52612050
| | | * | AVRCP Controller State without BrowsingJoseph Pirozzo2020-03-162-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some devices do not support Browsing over AVRCP and the playback state of those devices was inconsistent on disconnection of the Control channel. This change improves the consistency of the data reported via the media_session. Bug: 144013853 Test: atest AvrcpControllerStateMachineTest Change-Id: I3ce26d76a81422d1e5af8b439d8bc1ab30d320dc (cherry picked from commit 527da93c0bfa15a95b1de9b93cb9d955885af849) Merged-In: I3ce26d76a81422d1e5af8b439d8bc1ab30d320dc Change-Id: I1eeb1d3bd1c4dcb3bd14ba9c2851a9ad4aee6b61
| | | * | Add bluetooth prefs for Android AutomotiveSimon Dai2020-03-165-10/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add extra to BluetoothMediaBrowserService to redirect to settings when Bluetooth is not connected Fixes: 134514401 Test: verify extra in the media session state at startup and after disconnection. Change-Id: Iffbd6704eb82e02233b738c7ee06f5c4d8e3c0b5 (cherry picked from commit 6b9199e0548439300d41d70c7915012e2434ab78) Merged-In: Iffbd6704eb82e02233b738c7ee06f5c4d8e3c0b5 Change-Id: Ie5364fa2c0339c81e4444548d5e132caad789994
| | | * | MAP Client disconnect state machine if MAS client disconnectedJoseph Pirozzo2020-03-162-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the MAS client disconnects (Obex error or remote device terminates connection) close the state machine safely. Bug: 138379476 Test: atest MapClientStateMachineTest Change-Id: I11362911fc96cb15416242456fa3cf026c085745 (cherry picked from commit 9b5cd43f3b297ddf9c0c2bd7136a7de7f45312a1) Merged-In: I11362911fc96cb15416242456fa3cf026c085745 Change-Id: Ie0ec535543ef477130878f7a722c2c89edf022a0
| | | * | MAP Client close connection on MNS disconnectJoseph Pirozzo2020-03-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the MNS connection is terminated from the client side disconnect the corresponding MAS client. Bug: 129908795 Test: disconnect the MAP connection from the MAS server (MNS client) Change-Id: I39b524b2222d47a553eeaa4b9781f3200443cf8e (cherry picked from commit ec407574bee6c1cff4228daed8b413a82ff509b3) Merged-In: I39b524b2222d47a553eeaa4b9781f3200443cf8e Change-Id: I71426bef61234d1f1c61dfe94f23c266ea8e8a34
| | | * | MAP Client Only connect MNS in connected stateJoseph Pirozzo2020-03-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only allow the MNS to connect when the MAS client is in the connected state, this prevents the possibility of the MNS client from connecting if the MAS fails to connect. Bug: 135088863 Test: disallow MAS connection and verify MNS notifications don't arrive. Change-Id: I75de88e74708283ebbaef70251f7575c0da0c4d4 (cherry picked from commit ac9715de616a2e8de421d72dbb2fd1ef6a55842c) Merged-In: I75de88e74708283ebbaef70251f7575c0da0c4d4 Change-Id: I3103c679d37a0664da4f6e777d9d5f42af257f51
| | | * | MAP Client BMessage parser lengthJoseph Pirozzo2020-03-162-0/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate and catch errors in the BMessage pertaining to erroneous length. Bug: 123244713 Test: atest BmessageTest Change-Id: Ie9101e0be12d627a6fd3cec73eec9b977d8d40bb (cherry picked from commit a353a95c230b5546a17daea10390fbd4be0f9e63) Merged-In: Ie9101e0be12d627a6fd3cec73eec9b977d8d40bb Change-Id: Ie83f30e898d0f81eb81100fdb70859f92680d167
| | | * | MAP Client support incomming MMSJoseph Pirozzo2020-03-161-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for incomming MMS messages by leveraging the already existing parser. Bug: 119750641 Test: atest MapClientStateMachineTest Change-Id: Iad3806e39fa11b520f7bcc3b33426f0a65779530 (cherry picked from commit f3965e7d943daa79e2868c4c27f0bda3c59ad051) Merged-In: Iad3806e39fa11b520f7bcc3b33426f0a65779530 Change-Id: I54d1399350a5e3d89f51625dde101a1cc9129c06
| | | * | PBAP client, download favorite contactsAndrew Cheng2020-03-161-14/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 132636859 Test: ACTS/SL4A and PTS Change-Id: Ifb16fbad1b9fc2e75008678f4551f515c46161b3 (cherry picked from commit bef7cd95b9e718257bc0e290c815e8b004679846) Merged-In: Ifb16fbad1b9fc2e75008678f4551f515c46161b3 Change-Id: I7c00be60f19141c3120808eead51503f22e21891
| | | * | AVRCP MediaBrowserService support ACTION_PREPAREJoseph Pirozzo2020-03-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report support for ACTION_PREPARE when connected to a bluetooth device capable of streaming. Bug: 141469207 Test: dumpsys media_session reports ACTION_PREPARE in actions Change-Id: I43702ba629750c02411cd39a1211bb352cc7457b (cherry picked from commit fb2633f7877e04a82f409a39b89a1a90189c70c4) Merged-In: I43702ba629750c02411cd39a1211bb352cc7457b Change-Id: I09cb56e8f59dfa15faea6581f379c06665076a63
| | | * | AVRCP Controller onSkipToQueueItem invalidJoseph Pirozzo2020-03-162-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent exceptions where skip to queue item results in an invalid song. Bug: 138803592 Test: atest com.android.bluetooth.avrcpcontroller.AvrcpControllerStateMachineTest#testSkipToQueueInvalid Change-Id: Icb9b0e85188335299fb62f0b30ada0a005ad20a3 (cherry picked from commit 4eec318acc6cd14e09d5f8ef3495aee8a7317b8c) Merged-In: Icb9b0e85188335299fb62f0b30ada0a005ad20a3 Change-Id: I4adeb57c190c8214c83a153161ac138a8cd6ad51
| | | * | AVRCP Controller getCurrentCalls NPEJoseph Pirozzo2020-03-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for null call list if media device and phone call device are different. Bug: 138256493 Test: Connect 2 phones, one HFP one A2DP, receive incomming call. Change-Id: I5f5c85d65283add3790dfaa1f252c3a14127f822 (cherry picked from commit 26041cc83d7f02da41b88eb71eeb30b392d0cfc9) Merged-In: I5f5c85d65283add3790dfaa1f252c3a14127f822 Change-Id: I58538ae0faddec9a66a3a695f70a2c030681f603
| | | * | AVRCP Controller transient loss while idleJoseph Pirozzo2020-03-163-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While gaining and losing focus due to transient focus requests ensure Bluetooth restores to the correct playback state. This corrects issues that could arise during non media sonification durring a transient focus loss. Bug: 136092891 Test: atest com.android.bluetooth.a2dpsink.A2dpSinkStreamHandlerTest Change-Id: I58997b3b8b96da309ff4c31a2b3039dccf9b3578 (cherry picked from commit 32d3d5acac7eabd2bd00be46ea9e399a8b8db10b) Merged-In: I58997b3b8b96da309ff4c31a2b3039dccf9b3578 Change-Id: Ibefa524f14e2c0792278ab76161f7a8bcbc4fb9b
| | | * | AVRCP Controller request focus when idleJoseph Pirozzo2020-03-163-9/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no music is playing and an incoming play request comes in from a paired device, request focus on it's behalf. Bug: 135112399 Test: atest com.android.bluetooth.avrcpcontroller.AvrcpControllerStateMachineTest Change-Id: Ia764ea54af95166be6b6c3d9b47f3e3c2d09a0d7 (cherry picked from commit e6ff50d6328dca536acd131d91c109072febd70f) Merged-In: Ia764ea54af95166be6b6c3d9b47f3e3c2d09a0d7 Change-Id: I16d132e6fc90c1bb0f21d05de3ddf877ff5ea5b4
| | | * | AVRCP Controller AbsoluteVolumeNotificationJoseph Pirozzo2020-03-162-26/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update AbsoluteVolumeNotification request to properly respond to requests based upon the Fixed vs Dynamic volume levels. Bug: 129478624 Test: atest com.android.bluetooth.avrcpcontroller.AvrcpControllerStateMachineTest#testRegisterAbsVolumeNotification Change-Id: Ic9b745641a84712c005d40ecec50e55e9684d3ef (cherry picked from commit 8fd119d8a27d42e09a90280020925859fd0a1678) Merged-In: Ic9b745641a84712c005d40ecec50e55e9684d3ef Change-Id: I1212a70ab84e3aed926bcfcac04dc62efed4b489
| | | * | Splitting over-the-air downloading into batchesAndrew Cheng2020-03-163-24/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Splitting the over-the-air downloading of contacts into batches to ameliorate PBAP crash when system goes to S2R while download is in progress. Test: Use ACTS/SL4A: act.py -c <test_config>.json -tc BtCarPbapTest:test_contact_download Bug: b/117588939 Change-Id: I7d138a7d497c04c54710702320ba1fdea8f15ea7 (cherry picked from commit 1128539a1aced99db216bd86080dbab9c2b710ed) Merged-In: I7d138a7d497c04c54710702320ba1fdea8f15ea7 Change-Id: Idd1b1b5b22360ab36b05ddfbf62e5043e873098d
| | | * | Use Calendar.Builder for MAP Client timestamp parsingSal Savage2020-03-162-14/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MAP Client was reporting different timestamps for a given message-listing object each time getUnreadMessages() was called. The milliseconds value was always different. This was a result of the Calendar object pre-populating all fields with the current date-time. The reported date-time would always have the current time's milliseconds field. Datetime parsing has been updated to use a Calendar.Builder which is clearer and doesn't use the current time when initializing. The milliseconds field is explicitly set to zero. Tests were added for the ObexTime class to prevent this from happening in the future. Bug: b/135606822 Test: atest ObexTimeTest.java Change-Id: Ie872b4bb30f68e0c00b15767eb0413a6e67ba630 (cherry picked from commit 85fb0fe5d730d93850c7db0bc7eb2dc26d2ced50) Merged-In: Ie872b4bb30f68e0c00b15767eb0413a6e67ba630 Change-Id: Iab4e3cf5937958f500d58b9ba6fa64c439cd4dc9
| | | * | AVRCP Controller Shuffle/Repeat supportJoseph Pirozzo2020-03-167-254/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Custom actions to the Playback status for Shuffle and Repeat capabilities when available from the remote device. Bug: 72495707 Test: AvrcpControllerStateMachineTest#testShuffle AvrcpControllerStateMachineTest#testRepeat Change Shuffle and Repeat mode on connected phone via Headunit Change-Id: Ia0a62d10032b6e918a38e66bd486a29199b772e2 (cherry picked from commit 1c862460a544108b8b12fb24827f9a717961d410) Merged-In: Ia0a62d10032b6e918a38e66bd486a29199b772e2 Change-Id: I8669dbbe9552e5a53cb8c864c3e00c1c4df569ec
| | | * | Broadcast MAP Client messages oldest firstSal Savage2020-03-161-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: b/130260536 Test: Tested with kitchen sink on automotive hardware Change-Id: I6a373d7890e7680bb99d5e3c5a50c18648d8c003 (cherry picked from commit bfa93ce0bbb80d9e1de882769db4538627199b79) Merged-In: I6a373d7890e7680bb99d5e3c5a50c18648d8c003 Change-Id: Iaa4344b403a2ca539e818f09edf4e4b9f7a5c366
| | | * | DO NOT MERGE: Revert "AVRCP Controller AbsoluteVolumeNotification"Joseph Pirozzo2020-03-162-48/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This revert is reapplied after a few CLs to match change order to AOSP. This reverts commit fc9aee6d0bb93f8947f8c50e66ff7ba0e6f7a662. Bug: 129478624 Change-Id: I4bfdaa1717df89492bd74a1c59ad151d2161d0ab
| | | * | DO NOT MERGE: Revert "AVRCP Controller transient loss while idle"Joseph Pirozzo2020-03-163-36/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This revert is reapplied after a few CLs to match change order to AOSP. Bug: 136092891 This reverts commit 1812aafde9b3fd63e51f3579552f63278006c185.
| * | | Snap for 6304846 from 1b580b3a928781b087bfbaef4caa80041d038f9d to ↵android-build-team Robot2020-03-176-10/+10
| |\| | | | | | | | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: I2e4b6542d3c999c36bade02b8edfe2e5b61edf71
| | * | Import translations. DO NOT MERGEBill Yi2020-03-166-10/+10
| | |/ | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I07dd19412b882deb8417dd99d3cee3fbc388327e
| * | Snap for 6145145 from c4d9f202e10c9812e09a2b604c2f8c13393cdd19 to ↵android-build-team Robot2020-01-181-0/+26
| |\| | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: Ib2ebed1abb6f83dedbfe2f629471e8efb45d07f1
| | * Merge "Restore Parameters after audio server restart" into qt-qpr1-devJakub Pawlowski2020-01-171-0/+26
| |/|
| | * Restore Parameters after audio server restartJakub Pawlowski2019-10-091-0/+26
| | | | | | | | | | | | | | | | | | | | | Bug: 141724113 Test: kill audioserver during phone call Change-Id: I9b452a69ac711499b8a465b81225a3080a24e726 (cherry picked from commit 2974124d6f0325ec5c397fba070101a6b732aa2c)