summaryrefslogtreecommitdiff
path: root/service/java/com/android
AgeCommit message (Collapse)Author
2022-07-26Merge TP1A.220624.020Deyao Ren
Change-Id: I357db3da652d8ce93bb26a00d0f123fae1b7c64c
2022-07-01Catch IAE in BluetoothManagerServiceSungsoo Lim
Bug: 237175319 Tag: #refactor Test: build Change-Id: I7d7ef16387756a53115701c461fa735f214c3f25 (cherry picked from commit aed442ee917a0e050744ea7008a65d8043604e83) (cherry picked from commit b94bfd919269f879f181726309891992f6b2f475) Merged-In: I7d7ef16387756a53115701c461fa735f214c3f25
2022-06-30Revert "Revert "Reuse SynchronousResultReceivers instead of creating new.""Neha Jain
This reverts commit dd85e91cea26c7f706af36c852e79d5b4ca1f173. Bug: 217366135 Reason for revert: Need this to fix a crash bug in tm-dev Change-Id: I2a94c278edc0681c5b8af6ea0a0171b71d72c650 (cherry picked from commit dbaf406ccb0ed887d4e93057c9ec0d3457f14457) Merged-In: I2a94c278edc0681c5b8af6ea0a0171b71d72c650
2022-06-29Merge TP1A.220624.003Deyao Ren
Change-Id: I64d825a1bb7108a126ae036a1018bf740d724750
2022-06-29Revert "Reuse SynchronousResultReceivers instead of creating new."Neha Jain
This reverts commit 02dcbe72b3564559eaa9c2e2714824e4aac6f18c. Reason for revert: Causing builds to fail b/237471430 Change-Id: I6165d838abf312085050359377f67a68a5f8b51a (cherry picked from commit f5dd42bbd05e68f7763ccaa9fae5642acc4ceba1) Merged-In: I6165d838abf312085050359377f67a68a5f8b51a
2022-06-29Reuse SynchronousResultReceivers instead of creating new.Etienne Ruffieux
Bug: 217366135 Tag: #feature Test: manual Ignore-AOSP-First: to be chery-picked Change-Id: If8ae530a284151888a3f89a51d2c58f2a5cd3644 (cherry picked from commit 02dcbe72b3564559eaa9c2e2714824e4aac6f18c) Merged-In: If8ae530a284151888a3f89a51d2c58f2a5cd3644
2022-06-17Check sysprop value before trying to bind to serviceEtienne Ruffieux
TbsService and HeadsetService were missing one check before BluetoothManagerService would try to bond to them. Bug: 236196227 Tag: #feature Test: manual Ignore-AOSP-First: will be cherry-picked Change-Id: Iceb6c437216092a7dccc238f396f4d95e341af1d (cherry picked from commit ff0896dbdac477d3e6a3fa35d71f6daff28d37ad) Merged-In: Iceb6c437216092a7dccc238f396f4d95e341af1d
2022-06-15Merge "Prevent infinite rebind" into tm-devTreeHugger Robot
2022-06-14Prevent infinite rebindSungsoo Lim
Bug: 235495968 Tag: #refactor Test: manual Change-Id: Icfe55340b26c40111df0b2babbdfc40bf026dac0 (cherry picked from commit 00294a7805ec1ad337d331929370d464b2b6deaa)
2022-06-13Restore BluetoothOppLauncherActivity default stateEtienne Ruffieux
Bug: 228849846 Test: atest ManagedProfileTest Tag: #feature Ignore-AOSP-First: cherry-pick Change-Id: I010cf384a8b18a776d8052e87551b8af6fb348cb
2022-06-10Delay Bluetooth StartWilliam Escande
If bluetooth is started too early, it will need to be restarted to change its gid. By delaying the bluetooth start after the OnUserStarting we ensure the permissions are already set Fix: 232740613 Test: build & flash with wipe. Check log at first startup Tag: #refactor Ignore-AOSP-First: will be push on aosp next Change-Id: Ifde1348baad5802276679ecc24bc8ae458d02fe6
2022-05-30Bluetooth: Fix BT on failure during BT ON/OFF stress testNitin Shivpure
RCA: if MESSAGE_ENABLE is received & there is already a pending MESSAGE_ENABLE or MESSAGE_DISABLE in Handler queue, then isBle flag is not properly handled while requeuing the MESSAGE_ENABLE OR MESSAGE_DISABLE, which is causing BT ON failure during BT ON/OFF stress test Fix: - If MESSAGE_ENABLE is received & there is already a pending MESSAGE_ENABLE or MESSAGE_DISABLE in Handler queue, then Handling isBle flag properly while requeuing the MESSAGE_ENABLE or MESSAGE_DISABLE. - If MESSAGE_DISABLE is received & there is already a pending MESSAGE_ENABLE in Handler queue, then isBle value is set based on mExternalEnable while requeuing the MESSAGE_ENABLE. CRs-Fixed: 3201863 Change-Id: I010b01c106a7dbcb0f194557e719c90c67842b25
2022-05-03Merge TP1A.220422.001Deyao Ren
Change-Id: I413ca31daa6902265a5a4fd83b646b3f049e5fd5
2022-04-22Merge TP1A.220414.003Scott Lobdell
Change-Id: I7225f3a31204834ab12679885cd136bdff31f554
2022-04-19Fix updateOppLauncherComponentState package nameEtienne Ruffieux
updateOppLauncherComponentState was using the old Bluetooth package name, now we call PackageManager to get it at runtime. Bug: 227078439 Test: atest testOppDisabledWhenRestrictionSet Tag: #stability Ignore-AOSP-First: rename in internal only Change-Id: I79c100673e98d4eb64652881428435f0ac6ba501
2022-04-14Listen for Intent.ACTION_USER_SWITCHED in BluetoothManagerServiceRahul Sabnis
instead of using the SystemService#onUserSwitching method Tag: #feature Bug: 228920751 Test: Manual Ignore-AOSP-First: Change only present in tm-dev Change-Id: Ic8c32c29662389bd62fa1684de9679c369545874 (cherry picked from commit 320618b16ff4923727d81be41dafe81a3876b123) Merged-In: Ic8c32c29662389bd62fa1684de9679c369545874
2022-04-14Revert "Save off foreground user id before passing the message to the ↵Rahul Sabnis
handler on" This reverts commit eda5120b133e6f55951287b1dd85b4bd290a60e7. Reason for revert: The issue in the bug is still reproducible after this change was landed Tag: #feature Bug: 228920751 Test: Manual Ignore-AOSP-First: Change only present in tm-dev Change-Id: I8d818370bcd6694b17c77545538f25fa2bbe2e34 (cherry picked from commit 2fece9705427955c24e47ce197fe4a0c595c7860) Merged-In: I8d818370bcd6694b17c77545538f25fa2bbe2e34
2022-04-14Listen for Intent.ACTION_USER_SWITCHED in BluetoothManagerServiceRahul Sabnis
instead of using the SystemService#onUserSwitching method Tag: #feature Bug: 228920751 Test: Manual Ignore-AOSP-First: Change only present in tm-dev Change-Id: Ic8c32c29662389bd62fa1684de9679c369545874
2022-04-14Revert "Save off foreground user id before passing the message to the ↵Rahul Sabnis
handler on" This reverts commit eda5120b133e6f55951287b1dd85b4bd290a60e7. Reason for revert: The issue in the bug is still reproducible after this change was landed Tag: #feature Bug: 228920751 Test: Manual Ignore-AOSP-First: Change only present in tm-dev Change-Id: I8d818370bcd6694b17c77545538f25fa2bbe2e34
2022-04-14Save off foreground user id before passing the message to the handler onRahul Sabnis
user switches Tag: #feature Bug: 228920751 Test: Manual Ignore-AOSP-First: Code only present in tm-dev Change-Id: Ic7d3c94880832f240f9d85b850cf2ce9936e3622 (cherry picked from commit eda5120b133e6f55951287b1dd85b4bd290a60e7) Merged-In: Ic7d3c94880832f240f9d85b850cf2ce9936e3622
2022-04-13Save off foreground user id before passing the message to the handler onRahul Sabnis
user switches Tag: #feature Bug: 228920751 Test: Manual Ignore-AOSP-First: Code only present in tm-dev Change-Id: Ic7d3c94880832f240f9d85b850cf2ce9936e3622
2022-04-09Merge "Disallow BLE enable in airplane mode" am: 788208c101 am: 45e6f35fe1 ↵Himanshu Rawat
am: 64ae5b73cd Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2046765 Change-Id: I648f6daf5192dad68f542f01cc0f57d346cdbed2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge "Disallow BLE enable in airplane mode" am: 788208c101Himanshu Rawat
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2046765 Change-Id: I86946412d8e374fad119ca913e71790a53ade2b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Disallow BLE enable in airplane modeHimanshu Rawat
If BLE enable is called when airplane mode is set, it may prevent BT from turning OFF completely. Bug: 208950823 Test: act.py -c test_config.json -tc BtStressTest:test_toggle_bluetooth; Or continuously toggle BT in airplane mode. Change-Id: Id2c9f8cbc49d455d133afe3b251b781ba925741e
2022-04-06Replace logic to determine the foreground user id with the SystemServiceRahul Sabnis
callback Tag: #feature Bug: 226404651 Test: Manual Ignore-AOSP-First: Resolving merge conflict Change-Id: I78e6ead277785dff4cbbf8fc218dc68dccdc28a5
2022-04-02Merge TP1A.220328.001Rob Seymour
Change-Id: I5f07094ba2fb3991da03673f97d2957b1f68018b
2022-03-24Changing apk name in the manifest and the corresponding packages.Roopa Sattiraju
BUG: 226403247 Test: TH Change-Id: I060dd05cf722a4185f85f4f1e231b63ae1508cb4
2022-03-23Restore call to Process.getPidsForCommand().xiaowang
CRs-Fixed: 2838648, 2891932 Bug: 224174628 Change-Id: Ib19c2ef2efed670ff7d2a3d58a8bada52fd3bc46
2022-03-23Merge changes from topic "Handle Shutdown Intent" am: bd01f52b72 am: c5741e1775Joner Lin
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2032224 Change-Id: Ide192bd17ce20476f0838b80ce2e695e00f4ac93
2022-03-23Handle SHUTDOWN Intent in BluetoothManagerService am: 753c739998 am: ce789ee6cfjonerlin
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2032223 Change-Id: Iba175a3044fa9a0090bc33a4efa818849dee2d66
2022-03-23Do not allow Bluetooth enabling during device shutting downjonerlin
Tag: #feature Bug: 207521630 Test: reboot device in BLE_ON state, check log Change-Id: Ia51355ae88919d81108a619e789c6d3415962231 Merged-In: I6330d2f94fe7a5ca582df83c9fa32c5c6cba5186
2022-03-23Handle SHUTDOWN Intent in BluetoothManagerServicejonerlin
Tag: #feature Bug: 207521630 Test: reboot device and check log Change-Id: I9dc8a561fd63545d75a1080402b972cd989c99a6 Merged-In: Ib30a5000ff1be24c276e673d096f67acb64136d6
2022-03-21Do not allow Bluetooth enabling during device shutting downjonerlin
Tag: #feature Bug: 207521630 Test: reboot device in BLE_ON state, check log Ignore-AOSP-First: Conflict with internal Change-Id: I6330d2f94fe7a5ca582df83c9fa32c5c6cba5186
2022-03-21Handle SHUTDOWN Intent in BluetoothManagerServicejonerlin
Tag: #feature Bug: 207521630 Test: reboot device and check log Ignore-AOSP-First: Conflict with internal Change-Id: Ib30a5000ff1be24c276e673d096f67acb64136d6
2022-03-17Merge TP1A.220310.002Daniel Norman
Change-Id: If2f3a2a6833c45ec4c0cba7c7e668a487938cb92
2022-03-12Disable call to Process.getPidsForCommand().Daniel Norman
This file is unable to view that function in the test_suites_x86_64 build. This logic was originally added in https://keystone-qcom-review.googlesource.com/c/platform/frameworks/base/+/507267 Bug: TODO Change-Id: I0f3b04042e7e2da962cc4982a33d7c3f7d6f9ac7
2022-03-11Merge TP1A.220225.003Scott Lobdell
Change-Id: Id71ac466dbfe3707fe2e544ce22b1da8f474ec2b
2022-03-09Merge "Add BluetoothShellCommand" am: ccf3bda9a2 am: b58752d3b2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1997211 Change-Id: I8ca12f3bec19f3d04fb25b5b7e6b3c2af6d189c5
2022-03-07Merge TP1A.220209.001Deyao Ren
Change-Id: Id0e2895d3220831d2c617a243047e8229af8acc9
2022-03-07Added missing profile owner check to enable/disableEtienne Ruffieux
Bug: 222662836 Test: atest Tag: #feature Ignore-AOSP-First: Restriction only in internal for now Change-Id: Ib46ce38699ab5795b23ace594a5ad19efd66ecbc
2022-03-01Merge "Add BluetoothShellCommand" into tm-devTreeHugger Robot
2022-02-24Removed unused checks in BluetoothManagerServiceEtienne Ruffieux
Test: manual Bug: 216497194 Tag: #feature Change-Id: I713c63d6bc7098694f47b83c63f06f6c63c7e13b Ignore-AOSP-First: modifications only on internal
2022-02-23Add BluetoothShellCommandWilliam Escande
This is deprecating the svc command for mainline Fix: 216233593 Tag: #refactor Test: manual: adb shell cmd bluetooth_manager enable Test: manual: adb shell cmd bluetooth_manager disable Ignore-AOSP-First: Merge conflict resolution on package name Change-Id: I19f71fbf689d8551b20359f577fbffd999806273
2022-02-23Add BluetoothShellCommandWilliam Escande
This is deprecating the svc command for mainline Fix: 216233593 Tag: #refactor Test: manual: adb shell cmd bluetooth_manager enable Test: manual: adb shell cmd bluetooth_manager disable Merged-In: I19f71fbf689d8551b20359f577fbffd999806273 Change-Id: I19f71fbf689d8551b20359f577fbffd999806273
2022-02-14Changing server location to com.android.server.bluetoothRoopa Sattiraju
Bug: 217736913 Test: Compile and bringup Change-Id: I3c1e07567949dd9e503a62b65feee4c7b5e10b2d
2022-02-10fixing CTS tests for BluetoothAdapter restrictionsEtienne Ruffieux
Tag: #feature Test: atest Bug: 218719641 Ignore-AOSP-First: change only in internal Change-Id: I8e28eafcd6ba9dc67e205eec06ae07639a7e0a60
2022-02-09Merge TP1A.220126.001Haamed Gheibi
Change-Id: Ibe4916c42b096976ac917991cf0c73f02512f3d4
2022-02-08Deprecating BluetoothAdapter enable/disableEtienne Ruffieux
Starting from T, BluetoothAdapter enable/disable APIs are limited to system apps or device owners. Tag: #feature Bug: 218493289 Test: manual Ignore-AOSP-First: Merge conflict Change-Id: I851830eae8a3a2bb4be4b2bcf6147fd81e092f2a
2022-02-04Merge "Restore the getInt / getString call"TreeHugger Robot
2022-02-04Merge TP1A.220120.003Haamed Gheibi
Change-Id: I202f5093bbd13b381ea11f969fee6154ba91fa11