diff options
| author | Himanshu Rawat <rwt@google.com> | 2022-04-07 10:22:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-07 10:22:17 +0000 |
| commit | 45e6f35fe1ea0adbab3f94794d3d324df19a155d (patch) | |
| tree | 228b486507edf5c070def2c14d397811df463175 /service/java/com/android/server/bluetooth/BluetoothManagerService.java | |
| parent | 70b6e76affdd5cfd99e474a67d8595138cd57119 (diff) | |
| parent | 788208c101e6e0d43ffd98edd1b441cba1192a01 (diff) | |
Merge "Disallow BLE enable in airplane mode" am: 788208c101
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>
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"); } |