Cache foreground user, rather than obtaining it on each call (3f20771a) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/Utils.java

+12 −22

Original line number	Diff line number	Diff line
		@@ -225,44 +225,34 @@ public final class Utils {
		Utils.sSystemUiUid = uid;
		}

		static int sForegroundUserId = UserHandle.USER_NULL;
		public static void setForegroundUserId(int uid) {
		Utils.sForegroundUserId = uid;
		}

		public static boolean checkCaller() {
		// Get the caller's user id then clear the calling identity
		// which will be restored in the finally clause.
		int callingUser = UserHandle.getCallingUserId();
		int callingUid = Binder.getCallingUid();
		long ident = Binder.clearCallingIdentity();

		try {
		// With calling identity cleared the current user is the foreground user.
		int foregroundUser = ActivityManager.getCurrentUser();
		return (foregroundUser == callingUser) \|\| (sSystemUiUid == callingUid)
		return (sForegroundUserId == callingUser) \|\| (sSystemUiUid == callingUid)
		\|\| (Process.SYSTEM_UID == callingUid);
		} catch (Exception ex) {
		Log.e(TAG, "checkIfCallerIsSelfOrForegroundUser: Exception ex=" + ex);
		return false;
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}

		public static boolean checkCallerAllowManagedProfiles(Context mContext) {
		if (mContext == null) {
		return checkCaller();
		}
		// Get the caller's user id and if it's a managed profile, get it's parents
		// id, then clear the calling identity
		// which will be restored in the finally clause.
		int callingUser = UserHandle.getCallingUserId();
		int callingUid = Binder.getCallingUid();

		// Use the Bluetooth process identity when making call to get parent user
		long ident = Binder.clearCallingIdentity();
		try {
		UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
		UserInfo ui = um.getProfileParent(callingUser);
		int parentUser = (ui != null) ? ui.id : UserHandle.USER_NULL;
		// With calling identity cleared the current user is the foreground user.
		int foregroundUser = ActivityManager.getCurrentUser();

		// Always allow SystemUI/System access.
		return (foregroundUser == callingUser) \|\| (foregroundUser == parentUser)
		return (sForegroundUserId == callingUser) \|\| (sForegroundUserId == parentUser)
		\|\| (sSystemUiUid == callingUid) \|\| (Process.SYSTEM_UID == callingUid);
		} catch (Exception ex) {
		Log.e(TAG, "checkCallerAllowManagedProfiles: Exception ex=" + ex);

src/com/android/bluetooth/btservice/AdapterService.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.bluetooth.btservice;

		import android.app.ActivityManager;
		import android.app.AlarmManager;
		import android.app.PendingIntent;
		import android.app.Service;
		@@ -456,6 +457,12 @@ public class AdapterService extends Service {
		// Some platforms, such as wearables do not have a system ui.
		Log.w(TAG, "Unable to resolve SystemUI's UID.", e);
		}

		IntentFilter filter = new IntentFilter(Intent.ACTION_USER_SWITCHED);
		getApplicationContext().registerReceiverAsUser(sUserSwitchedReceiver, UserHandle.ALL,
		filter, null, null);
		int fuid = ActivityManager.getCurrentUser();
		Utils.setForegroundUserId(fuid);
		}

		@Override
		@@ -482,6 +489,16 @@ public class AdapterService extends Service {
		}
		}

		public static final BroadcastReceiver sUserSwitchedReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		if (Intent.ACTION_USER_SWITCHED.equals(intent.getAction())) {
		int fuid = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0);
		Utils.setForegroundUserId(fuid);
		}
		}
		};

		void bleOnProcessStart() {
		debugLog("bleOnProcessStart()");