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

Commit 461ea8ce authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow SHELL_UID to disable Bluetooth for testing" am: 4c462bee 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1796128

Change-Id: Ic2b5ce12110773fde15da68cc93457b7544a9e48
parents aa055142 4c462bee

services/core/java/com/android/server/BluetoothManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -2430,7 +2430,8 @@ class BluetoothManagerService extends IBluetoothManager.Stub { 
        try {

            foregroundUser = ActivityManager.getCurrentUser();

            valid = (callingUser == foregroundUser) || parentUser == foregroundUser

                    || callingAppId == Process.NFC_UID || callingAppId == mSystemUiUid;

                    || callingAppId == Process.NFC_UID || callingAppId == mSystemUiUid

                    || callingAppId == Process.SHELL_UID;

            if (DBG && !valid) {

                Slog.d(TAG, "checkIfCallerIsForegroundUser: valid=" + valid + " callingUser="

                        + callingUser + " parentUser=" + parentUser + " foregroundUser="