Merge "Propagate calling UID to AM from LauncherApps" into pi-dev (f683c14b) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManagerInternal.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -235,6 +235,17 @@ public abstract class ActivityManagerInternal {
		public abstract int startActivitiesAsPackage(String packageName,
		int userId, Intent[] intents, Bundle bOptions);

		/**
		* Start activity {@code intent} without calling user-id check.
		*
		* - DO NOT call it with the calling UID cleared.
		* - The caller must do the calling user ID check.
		*
		* @return error codes used by {@link IActivityManager#startActivity} and its siblings.
		*/
		public abstract int startActivityAsUser(IApplicationThread caller, String callingPackage,
		Intent intent, @Nullable Bundle options, int userId);

		/**
		* Get the procstate for the UID. The return value will be between
		* {@link ActivityManager#MIN_PROCESS_STATE} and {@link ActivityManager#MAX_PROCESS_STATE}.

core/java/android/content/pm/ILauncherApps.aidl

+3 −2

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

		package android.content.pm;

		import android.app.IApplicationThread;
		import android.content.ComponentName;
		import android.content.Intent;
		import android.content.IntentSender;
		@@ -42,10 +43,10 @@ interface ILauncherApps {
		String callingPackage, String packageName, in UserHandle user);
		ActivityInfo resolveActivity(
		String callingPackage, in ComponentName component, in UserHandle user);
		void startActivityAsUser(String callingPackage,
		void startActivityAsUser(in IApplicationThread caller, String callingPackage,
		in ComponentName component, in Rect sourceBounds,
		in Bundle opts, in UserHandle user);
		void showAppDetailsAsUser(
		void showAppDetailsAsUser(in IApplicationThread caller,
		String callingPackage, in ComponentName component, in Rect sourceBounds,
		in Bundle opts, in UserHandle user);
		boolean isPackageEnabled(String callingPackage, String packageName, in UserHandle user);

core/java/android/content/pm/LauncherApps.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -548,7 +548,8 @@ public class LauncherApps {
		Log.i(TAG, "StartMainActivity " + component + " " + user.getIdentifier());
		}
		try {
		mService.startActivityAsUser(mContext.getPackageName(),
		mService.startActivityAsUser(mContext.getIApplicationThread(),
		mContext.getPackageName(),
		component, sourceBounds, opts, user);
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		@@ -568,7 +569,8 @@ public class LauncherApps {
		Rect sourceBounds, Bundle opts) {
		logErrorForInvalidProfileAccess(user);
		try {
		mService.showAppDetailsAsUser(mContext.getPackageName(),
		mService.showAppDetailsAsUser(mContext.getIApplicationThread(),
		mContext.getPackageName(),
		component, sourceBounds, opts, user);
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();

services/core/java/com/android/server/am/ActivityManagerService.java

+23 −2

Original line number	Diff line number	Diff line
		@@ -5049,9 +5049,20 @@ public class ActivityManagerService extends IActivityManager.Stub
		public final int startActivityAsUser(IApplicationThread caller, String callingPackage,
		Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,
		int startFlags, ProfilerInfo profilerInfo, Bundle bOptions, int userId) {
		return startActivityAsUser(caller, callingPackage, intent, resolvedType, resultTo,
		resultWho, requestCode, startFlags, profilerInfo, bOptions, userId,
		true /validateIncomingUser/);
		}

		public final int startActivityAsUser(IApplicationThread caller, String callingPackage,
		Intent intent, String resolvedType, IBinder resultTo, String resultWho, int requestCode,
		int startFlags, ProfilerInfo profilerInfo, Bundle bOptions, int userId,
		boolean validateIncomingUser) {
		enforceNotIsolatedCaller("startActivity");
		userId = mUserController.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(),
		userId, false, ALLOW_FULL_ONLY, "startActivity", null);

		userId = mActivityStartController.checkTargetUser(userId, validateIncomingUser,
		Binder.getCallingPid(), Binder.getCallingUid(), "startActivityAsUser");

		// TODO: Switch to user app stacks here.
		return mActivityStartController.obtainStarter(intent, "startActivityAsUser")
		.setCaller(caller)
		@@ -26217,6 +26228,16 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		}

		@Override
		public int startActivityAsUser(IApplicationThread caller, String callerPacakge,
		Intent intent, Bundle options, int userId) {
		return ActivityManagerService.this.startActivityAsUser(
		caller, callerPacakge, intent,
		intent.resolveTypeIfNeeded(mContext.getContentResolver()),
		null, null, 0, Intent.FLAG_ACTIVITY_NEW_TASK, null, options, userId,
		false /validateIncomingUser/);
		}

		@Override
		public int getUidProcessState(int uid) {
		return getUidState(uid);

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+12 −6

Original line number	Diff line number	Diff line
		@@ -1315,10 +1315,6 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		return aInfo;
		}

		ResolveInfo resolveIntent(Intent intent, String resolvedType, int userId) {
		return resolveIntent(intent, resolvedType, userId, 0, Binder.getCallingUid());
		}

		ResolveInfo resolveIntent(Intent intent, String resolvedType, int userId, int flags,
		int filterCallingUid) {
		synchronized (mService) {
		@@ -1330,9 +1326,19 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		\|\| (intent.getFlags() & Intent.FLAG_ACTIVITY_MATCH_EXTERNAL) != 0) {
		modifiedFlags \|= PackageManager.MATCH_INSTANT;
		}

		// In order to allow cross-profile lookup, we clear the calling identity here.
		// Note the binder identity won't affect the result, but filterCallingUid will.

		// Cross-user/profile call check are done at the entry points
		// (e.g. AMS.startActivityAsUser).
		final long token = Binder.clearCallingIdentity();
		try {
		return mService.getPackageManagerInternalLocked().resolveIntent(
		intent, resolvedType, modifiedFlags, userId, true, filterCallingUid);

		} finally {
		Binder.restoreCallingIdentity(token);
		}
		} finally {
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}