Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I69b75d06270b39b065aa9a7c1fa9defd828acfcc
This commit is contained in:
TreeHugger Robot
2021-09-02 20:21:29 +00:00
committed by Automerger Merge Worker
parent cfcee41d14 f8579cf75d
commit 1cf149d1a6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -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="