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

Commit 1cf149d1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow SHELL_UID to disable Bluetooth for testing" into sc-qpr1-dev am: f8579cf7 

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

Change-Id: I69b75d06270b39b065aa9a7c1fa9defd828acfcc
parents cfcee41d f8579cf7

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

+2 −1
Original line number Diff line number Diff line
@@ -2479,7 +2479,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="