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

Commit 64ae5b73 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 

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



Change-Id: I6d74a04f7b785a10420f0c1ed3db8b765572a508
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59d9caae 45e6f35f

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

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

            }