summaryrefslogtreecommitdiff
path: root/service/java/com/android/server/bluetooth/BluetoothManagerService.java
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-09 23:09:28 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-09 23:09:28 +0000
commit4b17cbcccf3c79b9839b32d055883b4fa12dac6c (patch)
tree671509816cac7f79d56c4515300ace3e6a1c33c4 /service/java/com/android/server/bluetooth/BluetoothManagerService.java
parentc7d896b3b3e5aa58ec83546790cdd2f81ca32314 (diff)
parentd76065776b2690ee6c1595e46b10115ae0d32a42 (diff)
Snap for 8431966 from d76065776b2690ee6c1595e46b10115ae0d32a42 to tm-release
Change-Id: I0af90a0b5ca04edd75f394b617297a5f082d05f4
Diffstat (limited to 'service/java/com/android/server/bluetooth/BluetoothManagerService.java')
-rw-r--r--service/java/com/android/server/bluetooth/BluetoothManagerService.java3
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");
}