From 8e6936eae2f949066dcc6e2e66a48ffa50450402 Mon Sep 17 00:00:00 2001 From: Santos Cordon Date: Tue, 16 Dec 2014 10:02:44 -0800 Subject: [PATCH] Allow system process to interact with Bluetooth across users. Bug: 18688307 Change-Id: If31703fbe515baa40c242f99a61479a1ec8152b1 --- src/com/android/bluetooth/Utils.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/android/bluetooth/Utils.java b/src/com/android/bluetooth/Utils.java index 81dc40b8..0b2f836d 100644 --- a/src/com/android/bluetooth/Utils.java +++ b/src/com/android/bluetooth/Utils.java @@ -25,6 +25,7 @@ import android.content.ContextWrapper; import android.content.pm.UserInfo; import android.os.Binder; import android.os.ParcelUuid; +import android.os.Process; import android.os.UserHandle; import android.os.UserManager; import android.util.Log; @@ -205,10 +206,10 @@ final public class Utils { int foregroundUser = ActivityManager.getCurrentUser(); ok = (foregroundUser == callingUser); if (!ok) { - // Always allow SystemUI access. + // Always allow SystemUI/System access. int systemUiUid = ActivityThread.getPackageManager().getPackageUid( "com.android.systemui", UserHandle.USER_OWNER); - ok = systemUiUid == callingUid; + ok = (systemUiUid == callingUid) || (Process.SYSTEM_UID == callingUid); } } catch (Exception ex) { Log.e(TAG, "checkIfCallerIsSelfOrForegroundUser: Exception ex=" + ex); @@ -239,10 +240,10 @@ final public class Utils { ok = (foregroundUser == callingUser) || (foregroundUser == parentUser); if (!ok) { - // Always allow SystemUI access. + // Always allow SystemUI/System access. int systemUiUid = ActivityThread.getPackageManager().getPackageUid( "com.android.systemui", UserHandle.USER_OWNER); - ok = systemUiUid == callingUid; + ok = (systemUiUid == callingUid) || (Process.SYSTEM_UID == callingUid); } } catch (Exception ex) { Log.e(TAG, "checkCallerAllowManagedProfiles: Exception ex=" + ex); -- 2.11.0