diff options
| author | Himanshu Rawat <rwt@google.com> | 2022-04-09 00:46:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-09 00:46:20 +0000 |
| commit | 6afe372103012abd28c799074946e052337a5df6 (patch) | |
| tree | c00b6c05eaa9c07152f45ae24ad5c9c611d3374d /service/java/com/android/server/bluetooth/BluetoothManagerService.java | |
| parent | 0a15b6bc810ebce4735e412429cb51782c967fcf (diff) | |
| parent | 64ae5b73cd1c355a642b3a3a764cf511ad4eff2a (diff) | |
Merge "Disallow BLE enable in airplane mode" am: 788208c101 am: 45e6f35fe1 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>
Diffstat (limited to 'service/java/com/android/server/bluetooth/BluetoothManagerService.java')
| -rw-r--r-- | service/java/com/android/server/bluetooth/BluetoothManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/service/java/com/android/server/bluetooth/BluetoothManagerService.java b/service/java/com/android/server/bluetooth/BluetoothManagerService.java index a1efcf3c63..4ee392f08d 100644 --- a/service/java/com/android/server/bluetooth/BluetoothManagerService.java +++ b/service/java/com/android/server/bluetooth/BluetoothManagerService.java @@ -1078,7 +1078,8 @@ public class BluetoothManagerService extends IBluetoothManager.Stub { public boolean enableBle(AttributionSource attributionSource, IBinder token) throws RemoteException { final String packageName = attributionSource.getPackageName(); - if (!checkBluetoothPermissions(attributionSource, "enableBle", false)) { + if (!checkBluetoothPermissions(attributionSource, "enableBle", false) + || isAirplaneModeOn()) { if (DBG) { Log.d(TAG, "enableBle(): bluetooth disallowed"); } |