diff options
| author | Himanshu Rawat <rwt@google.com> | 2022-04-07 10:38:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-07 10:38:13 +0000 |
| commit | 64ae5b73cd1c355a642b3a3a764cf511ad4eff2a (patch) | |
| tree | 228b486507edf5c070def2c14d397811df463175 /service/java/com/android/server/bluetooth/BluetoothManagerService.java | |
| parent | 59d9caae6b3327f5f026f4b389e830455b5c5eec (diff) | |
| parent | 45e6f35fe1ea0adbab3f94794d3d324df19a155d (diff) | |
Merge "Disallow BLE enable in airplane mode" am: 788208c101 am: 45e6f35fe1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2046765
Change-Id: I6d74a04f7b785a10420f0c1ed3db8b765572a508
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 4bd707e3f1..c4ba076eaa 100644 --- a/service/java/com/android/server/bluetooth/BluetoothManagerService.java +++ b/service/java/com/android/server/bluetooth/BluetoothManagerService.java @@ -1063,7 +1063,8 @@ 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) { Slog.d(TAG, "enableBle(): bluetooth disallowed"); } |