Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6afe3721 authored by Himanshu Rawat's avatar Himanshu Rawat Committed by Automerger Merge Worker
Browse files

Merge "Disallow BLE enable in airplane mode" am: 788208c1 am: 45e6f35f am: 64ae5b73 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2046765



Change-Id: I648f6daf5192dad68f542f01cc0f57d346cdbed2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0a15b6bc 64ae5b73

service/java/com/android/server/bluetooth/BluetoothManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -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");

            }