Commit Graph

1706 Commits

Author SHA1 Message Date
Jakub Pawlowski
da0e253c5b Merge "Make BluetoothGattCallback.onServiceChanged public" am: 802503736d am: 531993dca1 am: 23c923d197 am: 41e6915dcd am: d69656a0b7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1439193

Change-Id: If481ce4165216b93c0c78ed070c757e9fc632d91
2020-09-27 07:35:49 +00:00
Jakub Pawlowski
d69656a0b7 Merge "Make BluetoothGattCallback.onServiceChanged public" am: 802503736d am: 531993dca1 am: 23c923d197 am: 41e6915dcd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1439193

Change-Id: Id9945a11865c9e4ae0155eccc19cbbdc90dd5d48
2020-09-26 17:10:25 +00:00
Jakub Pawlowski
2c1d2c21cf Make BluetoothGattCallback.onServiceChanged public
Bug: 154056389
Test: proper CTS test will be provided
Change-Id: I2c9264910b65d62124c75c3ee3fd0b5bd18a2006
2020-09-26 15:50:37 +00:00
HsingYuan Lo
57c801d839 Merge "Expose service changed event to application (2/3)" am: 199d2c7384 am: 90fd6a303f am: b9fadf6916 am: 0e73bae3af am: b784e06bb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433925

Change-Id: I803a9b4ef0dcc5ce05b3803e01b558571de16cd8
2020-09-25 06:43:38 +00:00
HsingYuan Lo
b784e06bb0 Merge "Expose service changed event to application (2/3)" am: 199d2c7384 am: 90fd6a303f am: b9fadf6916 am: 0e73bae3af
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1433925

Change-Id: If6b1bd5ee1e3719c1f803ad06eb5e5fa931398df
2020-09-25 06:19:51 +00:00
HsingYuan Lo
762a05f057 Expose service changed event to application (2/3)
Handle service changed event from GattService

Bug: 154056389
Tag: #feature
Test: test service changed scenario
Change-Id: If56dcbd7cf17b23c88cceb9c67c5d75b21320965
2020-09-24 09:27:58 +08:00
TreeHugger Robot
8e8eaa8624 Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." into rvc-qpr-dev am: 79a1219925 am: 46bc536504
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12657859

Change-Id: Ia9b8b3de2944bc971eaca463c8cb12c137911a9c
2020-09-22 21:14:26 +00:00
TreeHugger Robot
46bc536504 Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." into rvc-qpr-dev am: 79a1219925
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12657859

Change-Id: I4533f23095a2546d31d941d721c6766ad9bbdcda
2020-09-22 21:04:29 +00:00
Rahul Sabnis
4bbbfaa6ec Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from
the non-SDK API list to the blocklist in Android 11 back to the non-SDK
API list.

Tag: #feature
Bug: 168812851
Test: atest BluetoothHostTest#testCodecMethodsAccessible
Change-Id: I29983284b1a1c271d983c99b286e204604abdc72
2020-09-22 04:10:46 +00:00
Treehugger Robot
8f78267409 Merge "Add action for Bluetooth tethering state changed" am: cf44a015e8 am: 773810d198 am: f03a18b7ab am: eca1afc382 am: e6b1120635
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422889

Change-Id: Ib554a97fd7293c872690407ca791482c1d4ad56e
2020-09-18 03:56:01 +00:00
Treehugger Robot
cf44a015e8 Merge "Add action for Bluetooth tethering state changed" 2020-09-17 02:01:00 +00:00
Ted Wang
47558ca2b2 Add action for Bluetooth tethering state changed
Add new action for Bluetooth tethering state changed and extra for
broadcasting Bluetooth tethering state changed.

Tag: #feature
Bug: 138688805
Test: Manual
Change-Id: Ie0f848448f9717a6a1233d0dbb0785da7d30dc81
2020-09-16 10:31:25 +08:00
Jeff Sharkey
4b5b0174d0 Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc am: da7478b570 am: 487d394296
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: Id01f468b43fd5b2aada78608010625b392c1b647
2020-09-15 21:01:48 +00:00
Jeff Sharkey
a8cec413b6 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: I245b8d9cac722da76ea67983738a3cbb9deb68df
2020-09-14 10:00:07 -06:00
Jeff Sharkey
16dd960d6f Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: Id1a0f2a38e41badee3a34bd71af240511f273a7b
2020-09-14 10:00:05 -06:00
Xin Li
628590d7ec Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
2020-08-31 21:21:38 -07:00
Zach Johnson
1d7b632b7a Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" am: 22399aae26 am: e32671c74d am: dc08329ee9 am: 8f73278804 am: 99666c4572
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404838

Change-Id: I20e64adddf20667dc2abbfd5582a8cb34e3f0285
2020-08-20 03:45:02 +00:00
Zach Johnson
dc08329ee9 Merge "Remove listenUsingEncryptedRfcommOn & listenUsingScoOn" am: 22399aae26 am: e32671c74d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404838

Change-Id: Idcfc40762221d456374fdf7ee3f96123a137a793
2020-08-20 02:44:09 +00:00
Zach Johnson
f2a8b85026 Remove listenUsingEncryptedRfcommOn & listenUsingScoOn
both are hidden and not @UnsupportedAppUsage, so are safe to remove

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I58acb4160207fc0eeaeb7875bfd61f3bd442ad9a
2020-08-19 16:53:06 -07:00
TreeHugger Robot
27b4cb6bb7 Merge "Do not log sensitive information in AudioService." 2020-08-01 01:48:34 +00:00
jiabin
bacecee90b Do not log sensitive information in AudioService.
Sensitive information, such as IP and MAC address, should not be logged.
In AudioService, only log the last 3 octets of BT device address.

Test: make, connect BT device and log
Bug: 162299985
Change-Id: I99db812efc327e6f3ebe791274998291a140a5b6
2020-07-31 15:41:38 -07:00
Treehugger Robot
b3838bbbb0 Merge "Update language to comply with Android's inclusive language guidance" am: cc2d51fcef am: ed914ce683 am: 512c1c5ab9 am: e7d2991fb2 am: c08b68d049
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374017

Change-Id: Ife7a9e5dbd75d0bbe6d40ee257e50ea998df4822
2020-07-29 13:33:29 +00:00
Treehugger Robot
512c1c5ab9 Merge "Update language to comply with Android's inclusive language guidance" am: cc2d51fcef am: ed914ce683
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374017

Change-Id: Ib2aa56b08e4cf507a5c878295114091ce600eae0
2020-07-29 12:40:20 +00:00
Alice Kuo
9922d8cc9d Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

#inclusivefixit

Bug: 161896447
Test: NA (Comment only)

Change-Id: Id4f72f98d5a5def26d42d112aeb1b67217d38af0
2020-07-29 04:00:34 +00:00
Treehugger Robot
3d0dca5cab Merge "Bluetooth: MCE: Add new API to set message read status or deleted status" am: ab98549022 am: 5cdec2e9d1 am: e63b8e9c80 am: 3b61eb972d am: 411a126070
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1212983

Change-Id: Ibd790358305b25a922a0ffe6e4b1323a90759022
2020-07-14 22:29:10 +00:00
Treehugger Robot
e63b8e9c80 Merge "Bluetooth: MCE: Add new API to set message read status or deleted status" am: ab98549022 am: 5cdec2e9d1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1212983

Change-Id: Ie09a4b1e54288b88bc829c6713172c1dbe1608a2
2020-07-14 21:39:51 +00:00
Treehugger Robot
ab98549022 Merge "Bluetooth: MCE: Add new API to set message read status or deleted status" 2020-07-14 21:05:46 +00:00
Treehugger Robot
3fbe3564c3 Merge "Add debug log for set/remove active device." am: cbb4cd1f8c am: 1466c82f13 am: 24c414d9e5 am: a47b3f1ace am: d7cd0e2bb0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1351257

Change-Id: I66e6f219b8e4ab98a62eea2cd64de027f0810f0f
2020-07-09 03:50:43 +00:00
Treehugger Robot
24c414d9e5 Merge "Add debug log for set/remove active device." am: cbb4cd1f8c am: 1466c82f13
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1351257

Change-Id: I55b4b2f1296628228d36ed4259f08178b1a01d56
2020-07-09 03:14:48 +00:00
weichinweng
f6ec2d07e2 Add debug log for set/remove active device.
Bug: 160746277
Test: atest BluetoothInstrumentationTests
Tag: #feature
Change-Id: I3decaa102345d9e9485882cfeee2fae203264e25
2020-07-08 03:41:32 +00:00
Fei Zheng
bc5eaa9e36 Bluetooth: MCE: Add new API to set message read status or deleted status
Bug: 146314855
Test:
1. Pair with a remote device which address is like 00:01:02:03:04:05
2. On remote device allow MAP connection
3. Make sure there is at least 1 unread message in last week on remote device
4. adb shell am instrument -w -e mce_set_message_status_iterations 1 -e device_address
 00:01:02:03:04:05 -e class android.bluetooth.BluetoothStressTest#testMceSetMessageStatus
 com.android.bluetooth.tests/android.bluetooth.BluetoothTestRunner

Change-Id: I7a3e337142bc39a55c1bfd425e0966e1fb1b9a68
2020-06-26 07:27:35 +08:00
Makoto Onuki
a11035a7eb Remove unnecessarily @System/TestApi annotations
We can't expose APIs if the enclosing class is hidden, so these
annotations are redundant. We need to remove them so that we can enable the
check.

Exempt-From-Owner-Approval: Cherry-pick from goog/master
Bug: 159121253
Test: treehugger (i.e. this shouldn't trigger "API has changed" error.)
Merged-in: Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2
Change-Id: I36e3562b72e64b51e4febd1d42a3bc8e4dc60988
2020-06-24 20:49:20 +00:00
Makoto Onuki
42bec243c0 Remove unnecessarily @System/TestApi annotations
We can't expose APIs if the enclosing class is hidden, so these
annotations are redundant. We need to remove them so that we can enable the
check.

Exempt-From-Owner-Approval:Cherry-pick from goog/master
Bug: 159121253
Test: treehugger (i.e. this shouldn't trigger "API has changed" error.)
Merged-in: Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2
Change-Id: Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2
2020-06-24 18:02:10 +00:00
Makoto Onuki
4290301e85 Remove unnecessarily @System/TestApi annotations
We can't expose APIs if the enclosing class is hidden, so these
annotations are redundant. We need to remove them so that we can enable the
check.

Bug: 159121253
Test: treehugger (i.e. this shouldn't trigger "API has changed" error.)
Change-Id: Ie1841a670bdf6c6f4b25a1fc5deed8ec2d18cda2
2020-06-23 10:51:50 -07:00
Treehugger Robot
fb458a8894 Merge "A2DP: Check AAC bitrate mode by its CodecSpecific1" am: bdc57bef81 am: bb606cfc11 am: adeef01787 am: 4d88d35930 am: 850eb90b0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1207444

Change-Id: Ie107709fe30d2c7aa07491eaef77ec1839eb7696
2020-06-22 18:39:19 +00:00
Treehugger Robot
adeef01787 Merge "A2DP: Check AAC bitrate mode by its CodecSpecific1" am: bdc57bef81 am: bb606cfc11
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1207444

Change-Id: I0e6cab7597bbdf12292feb7c5b8a03bcd05df7f8
2020-06-22 17:59:33 +00:00
Treehugger Robot
bdc57bef81 Merge "A2DP: Check AAC bitrate mode by its CodecSpecific1" 2020-06-22 17:22:54 +00:00
Myles Watson
d4a13f56d8 Bluetooth: Add pairing initiator extra
Remember if the pairing app was in the foreground.

Bug: 150156492
Test: pair two devices, unpair on one device, try to reconnect
Change-Id: I6f564857974146e0c18134648eb1e297e8afbc6f
2020-06-13 14:09:16 +00:00
Lee Shombert
99e9f58e24 Create a binder cache for IBluetooth.getConnectionState
Bug: 157935587

This adds a binder cache for the IBluetooth.getConnectionState() method.
There is no change in bluetooth functionality.

Each atest is run twice.  Once with the code to be committed and once
with a special build that sets PropertyInvalidatedCache DEBUG and VERIFY
to true.  In the latter case, the test passes if the atest passes and if
there are no errors from the cache verification.

Tag: #feature

Test: atest BluetoothInstrumentationTests

Test results are
  Passed: 479, Failed: 0, Ignored: 4, Assumption Failed: 75

Change-Id: I2946297ffab557877dc7ec56206834d7c3776662
2020-06-08 11:25:15 -07:00
Treehugger Robot
6711ea61d1 Merge "BluetoothLeScanner: clarify the documentation for permission requirements for startScan" am: 9b128b9d1b am: 434d64e4a1 am: bbd3af4d38 am: ca6fd6265d am: 25cb277dff
Change-Id: I9975be2325ce653858943282391d0b7866a4e0ff
2020-05-18 18:52:51 +00:00
Treehugger Robot
bbd3af4d38 Merge "BluetoothLeScanner: clarify the documentation for permission requirements for startScan" am: 9b128b9d1b am: 434d64e4a1
Change-Id: I9cb189ffb7df29be2ae97de220ed03937eb19d40
2020-05-18 17:26:20 +00:00
Treehugger Robot
434d64e4a1 Merge "BluetoothLeScanner: clarify the documentation for permission requirements for startScan" am: 9b128b9d1b
Change-Id: I39ded23183483f8791d8a6ea8b474b5c72a7b2eb
2020-05-18 17:07:02 +00:00
Treehugger Robot
9b128b9d1b Merge "BluetoothLeScanner: clarify the documentation for permission requirements for startScan" 2020-05-18 16:51:02 +00:00
Jakub Pawlowski
f4d2f6c50c BluetoothLeScanner: clarify the documentation for permission requirements for startScan
Bug: 145153879
Change-Id: I698952f67cfc97a33b703096cbba65129a91c220
2020-05-13 17:55:53 +00:00
Hungyen Weng
6bf8181fb3 Merge "Revert "BluetoothProfileConnecter now calls the ServiceListener'..."" into rvc-dev am: 1c85c4501b am: ea25bab747 am: a2cdf90fe3 am: 70c72589aa
Change-Id: I3efb098573ec4f843ca26dc526c5360083e8aed0
2020-05-04 07:55:24 +00:00
Hungyen Weng
a2cdf90fe3 Merge "Revert "BluetoothProfileConnecter now calls the ServiceListener'..."" into rvc-dev am: 1c85c4501b am: ea25bab747
Change-Id: I1d08ff568dab3cca47c6841f58b0d4e024cf9e8c
2020-05-04 07:17:20 +00:00
Hungyen Weng
bacc6cd08c Merge "Revert "BluetoothProfileConnecter now calls the ServiceListener'..."" into rvc-dev am: 1c85c4501b
Change-Id: I12ad1c145a368be02b68b83e4568149cc7703202
2020-05-04 07:04:23 +00:00
Hungyen Weng
ba5692ea72 Revert "BluetoothProfileConnecter now calls the ServiceListener'..."
Revert submission 11348591-btmap-close-gts

Reason for revert: Droidcop reverted the change due to test failure, Test failed. https://android-build.googleplex.com/builds/tests/view?invocationId=I05500004181087103&testResultId=TR42507671126333727

Reverted Changes:
I324b4ea66:BluetoothProfileConnecter now calls the ServiceLis...
I1427f1a86:Add GTS test for BluetoothMap#close

Bug: 155587865

Change-Id: I9a2645c7bbaec9fdf0c6f5972b08ba70cfe78741
2020-05-04 04:53:46 +00:00
Rahul Sabnis
b6c9ed89a2 Merge "BluetoothProfileConnecter now calls the ServiceListener's onServiceDisconnected method after unbinding the service" into rvc-dev am: 248896bf98 am: d3d0f2a76d am: f0f934cb98 am: f72ca3ba12
Change-Id: Iac47dccd76d8f1e0b3952ea892b3bc550a318ec0
2020-05-03 06:23:05 +00:00
Rahul Sabnis
f0f934cb98 Merge "BluetoothProfileConnecter now calls the ServiceListener's onServiceDisconnected method after unbinding the service" into rvc-dev am: 248896bf98 am: d3d0f2a76d
Change-Id: If4b31c82c07f9b75b4eddb1f34c77a2a6affc4c6
2020-05-03 05:50:23 +00:00