Merge "Provide start parameters via setters on ActivityStarter." (b85ca745) · Commits · e / os / android_frameworks_base

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

+85 −29

Original line number	Diff line number	Diff line
		@@ -4522,9 +4522,18 @@ public class ActivityManagerService extends IActivityManager.Stub
		userId = mUserController.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(),
		userId, false, ALLOW_FULL_ONLY, "startActivity", null);
		// TODO: Switch to user app stacks here.
		return mActivityStartController.startActivityMayWait(caller, -1, callingPackage,
		intent, resolvedType, null, null, resultTo, resultWho, requestCode, startFlags,
		profilerInfo, null, null, bOptions, false, userId, null, "startActivityAsUser");
		return mActivityStartController.obtainStarter(intent, "startActivityAsUser")
		.setCaller(caller)
		.setCallingPackage(callingPackage)
		.setResolvedType(resolvedType)
		.setResultTo(resultTo)
		.setResultWho(resultWho)
		.setRequestCode(requestCode)
		.setStartFlags(startFlags)
		.setProfilerInfo(profilerInfo)
		.setMayWait(bOptions, userId)
		.execute();

		}

		@Override
		@@ -4585,11 +4594,17 @@ public class ActivityManagerService extends IActivityManager.Stub

		// TODO: Switch to user app stacks here.
		try {
		int ret = mActivityStartController.startActivityMayWait(null, targetUid,
		targetPackage, intent, resolvedType, null, null, resultTo, resultWho,
		requestCode, startFlags, null, null, null, bOptions, ignoreTargetSecurity,
		userId, null, "startActivityAsCaller");
		return ret;
		return mActivityStartController.obtainStarter(intent, "startActivityAsCaller")
		.setCallingUid(targetUid)
		.setCallingPackage(targetPackage)
		.setResolvedType(resolvedType)
		.setResultTo(resultTo)
		.setResultWho(resultWho)
		.setRequestCode(requestCode)
		.setStartFlags(startFlags)
		.setMayWait(bOptions, userId)
		.setIgnoreTargetSecurity(ignoreTargetSecurity)
		.execute();
		} catch (SecurityException e) {
		// XXX need to figure out how to propagate to original app.
		// A SecurityException here is generally actually a fault of the original
		@@ -4615,9 +4630,18 @@ public class ActivityManagerService extends IActivityManager.Stub
		userId, false, ALLOW_FULL_ONLY, "startActivityAndWait", null);
		WaitResult res = new WaitResult();
		// TODO: Switch to user app stacks here.
		mActivityStartController.startActivityMayWait(caller, -1, callingPackage, intent,
		resolvedType, null, null, resultTo, resultWho, requestCode, startFlags,
		profilerInfo, res, null, bOptions, false, userId, null, "startActivityAndWait");
		mActivityStartController.obtainStarter(intent, "startActivityAndWait")
		.setCaller(caller)
		.setCallingPackage(callingPackage)
		.setResolvedType(resolvedType)
		.setResultTo(resultTo)
		.setResultWho(resultWho)
		.setRequestCode(requestCode)
		.setStartFlags(startFlags)
		.setMayWait(bOptions, userId)
		.setProfilerInfo(profilerInfo)
		.setWaitResult(res)
		.execute();
		return res;
		}

		@@ -4629,10 +4653,17 @@ public class ActivityManagerService extends IActivityManager.Stub
		userId = mUserController.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(),
		userId, false, ALLOW_FULL_ONLY, "startActivityWithConfig", null);
		// TODO: Switch to user app stacks here.
		int ret = mActivityStartController.startActivityMayWait(caller, -1, callingPackage, intent,
		resolvedType, null, null, resultTo, resultWho, requestCode, startFlags, null, null,
		config, bOptions, false, userId, null, "startActivityWithConfig");
		return ret;
		return mActivityStartController.obtainStarter(intent, "startActivityWithConfig")
		.setCaller(caller)
		.setCallingPackage(callingPackage)
		.setResolvedType(resolvedType)
		.setResultTo(resultTo)
		.setResultWho(resultWho)
		.setRequestCode(requestCode)
		.setStartFlags(startFlags)
		.setGlobalConfiguration(config)
		.setMayWait(bOptions, userId)
		.execute();
		}

		@Override
		@@ -4678,9 +4709,16 @@ public class ActivityManagerService extends IActivityManager.Stub
		userId = mUserController.handleIncomingUser(callingPid, callingUid, userId, false,
		ALLOW_FULL_ONLY, "startVoiceActivity", null);
		// TODO: Switch to user app stacks here.
		return mActivityStartController.startActivityMayWait(null, callingUid, callingPackage,
		intent, resolvedType, session, interactor, null, null, 0, startFlags, profilerInfo,
		null, null, bOptions, false, userId, null, "startVoiceActivity");
		return mActivityStartController.obtainStarter(intent, "startVoiceActivity")
		.setCallingUid(callingUid)
		.setCallingPackage(callingPackage)
		.setResolvedType(resolvedType)
		.setVoiceSession(session)
		.setVoiceInteractor(interactor)
		.setStartFlags(startFlags)
		.setProfilerInfo(profilerInfo)
		.setMayWait(bOptions, userId)
		.execute();
		}

		@Override
		@@ -4689,9 +4727,13 @@ public class ActivityManagerService extends IActivityManager.Stub
		enforceCallingPermission(BIND_VOICE_INTERACTION, "startAssistantActivity()");
		userId = mUserController.handleIncomingUser(callingPid, callingUid, userId, false,
		ALLOW_FULL_ONLY, "startAssistantActivity", null);
		return mActivityStartController.startActivityMayWait(null, callingUid, callingPackage,
		intent, resolvedType, null, null, null, null, 0, 0, null, null, null, bOptions,
		false, userId, null, "startAssistantActivity");

		return mActivityStartController.obtainStarter(intent, "startAssistantActivity")
		.setCallingUid(callingUid)
		.setCallingPackage(callingPackage)
		.setResolvedType(resolvedType)
		.setMayWait(bOptions, userId)
		.execute();
		}

		@Override
		@@ -4731,9 +4773,12 @@ public class ActivityManagerService extends IActivityManager.Stub
		intent.setFlags(FLAG_ACTIVITY_NEW_TASK);
		intent.setComponent(recentsComponent);
		intent.putExtras(options);
		return mActivityStartController.startActivityMayWait(null, recentsUid,
		recentsPackage, intent, null, null, null, null, null, 0, 0, null, null,
		null, activityOptions, false, userId, null, "startRecentsActivity");

		return mActivityStartController.obtainStarter(intent, "startRecentsActivity")
		.setCallingUid(recentsUid)
		.setCallingPackage(recentsPackage)
		.setMayWait(activityOptions, userId)
		.execute();
		}
		} finally {
		Binder.restoreCallingIdentity(origId);
		@@ -4906,11 +4951,22 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		final long origId = Binder.clearCallingIdentity();
		int res = mActivityStartController.startActivity(r.app.thread, intent,
		null /ephemeralIntent/, r.resolvedType, aInfo, null /rInfo/, null,
		null, resultTo != null ? resultTo.appToken : null, resultWho, requestCode, -1,
		r.launchedFromUid, r.launchedFromPackage, -1, r.launchedFromUid, 0, options,
		false, false, null, null, "startNextMatchingActivity");
		// TODO(b/64750076): Check if calling pid should really be -1.
		final int res = mActivityStartController
		.obtainStarter(intent, "startNextMatchingActivity")
		.setCaller(r.app.thread)
		.setResolvedType(r.resolvedType)
		.setActivityInfo(aInfo)
		.setResultTo(resultTo != null ? resultTo.appToken : null)
		.setResultWho(resultWho)
		.setRequestCode(requestCode)
		.setCallingPid(-1)
		.setCallingUid(r.launchedFromUid)
		.setCallingPackage(r.launchedFromPackage)
		.setRealCallingPid(-1)
		.setRealCallingUid(r.launchedFromUid)
		.setActivityOptions(options)
		.execute();
		Binder.restoreCallingIdentity(origId);

		r.finishing = wasFinishing;

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

+13 −6

Original line number	Diff line number	Diff line
		@@ -3899,12 +3899,19 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
		try {
		ActivityInfo aInfo = AppGlobals.getPackageManager().getActivityInfo(
		destIntent.getComponent(), 0, srec.userId);
		int res = mService.getActivityStartController().startActivity(
		srec.app.thread, destIntent, null /ephemeralIntent/, null, aInfo,
		null /rInfo/, null, null, parent.appToken, null, 0, -1,
		parent.launchedFromUid, parent.launchedFromPackage, -1,
		parent.launchedFromUid, 0, null, false, true, null, null,
		"navigateUpTo");
		// TODO(b/64750076): Check if calling pid should really be -1.
		final int res = mService.getActivityStartController()
		.obtainStarter(destIntent, "navigateUpTo")
		.setCaller(srec.app.thread)
		.setActivityInfo(aInfo)
		.setResultTo(parent.appToken)
		.setCallingPid(-1)
		.setCallingUid(parent.launchedFromUid)
		.setCallingPackage(parent.launchedFromPackage)
		.setRealCallingPid(-1)
		.setRealCallingUid(parent.launchedFromUid)
		.setComponentSpecified(true)
		.execute();
		foundParentInTask = res == ActivityManager.START_SUCCESS;
		} catch (RemoteException e) {
		foundParentInTask = false;

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

+52 −76

Original line number	Diff line number	Diff line
		@@ -25,8 +25,6 @@ import static com.android.server.am.ActivityManagerService.ALLOW_FULL_ONLY;

		import android.app.ActivityOptions;
		import android.app.IApplicationThread;
		import android.app.ProfilerInfo;
		import android.app.WaitResult;
		import android.content.ComponentName;
		import android.content.ContentResolver;
		import android.content.Intent;
		@@ -34,7 +32,6 @@ import android.content.pm.ActivityInfo;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.content.res.Configuration;
		import android.os.Binder;
		import android.os.Bundle;
		import android.os.FactoryTest;
		@@ -43,12 +40,10 @@ import android.os.IBinder;
		import android.os.Looper;
		import android.os.Message;
		import android.provider.Settings;
		import android.service.voice.IVoiceInteractionSession;
		import android.util.Slog;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.server.am.ActivityStackSupervisor.PendingActivityLaunch;
		import com.android.internal.app.IVoiceInteractor;
		import com.android.server.am.ActivityStarter.DefaultFactory;
		import com.android.server.am.ActivityStarter.Factory;

		@@ -72,7 +67,6 @@ public class ActivityStartController {

		private final ActivityManagerService mService;
		private final ActivityStackSupervisor mSupervisor;
		private final ActivityStartInterceptor mInterceptor;

		/** Last home activity record we attempted to start. */
		private ActivityRecord mLastHomeActivityStartRecord;
		@@ -115,7 +109,9 @@ public class ActivityStartController {
		private ActivityStarter mLastStarter;

		ActivityStartController(ActivityManagerService service) {
		this(service, service.mStackSupervisor, new DefaultFactory());
		this(service, service.mStackSupervisor,
		new DefaultFactory(service, service.mStackSupervisor,
		new ActivityStartInterceptor(service, service.mStackSupervisor)));
		}

		@VisibleForTesting
		@@ -124,38 +120,20 @@ public class ActivityStartController {
		mService = service;
		mSupervisor = supervisor;
		mHandler = new StartHandler(mService.mHandlerThread.getLooper());
		mInterceptor = new ActivityStartInterceptor(mService, mSupervisor);
		mFactory = factory;
		mFactory.setController(this);
		}

		/**
		* Retrieves a starter to be used for a new start request. The starter will be added to the
		* active starters list.
		*
		* TODO(b/64750076): This should be removed when {@link #obtainStarter} is implemented. At that
		* time, {@link ActivityStarter#execute} will be able to handle cleaning up the starter's
		* internal references.
		* @return A starter to configure and execute starting an activity. It is valid until after
		* {@link ActivityStarter#execute} is invoked. At that point, the starter should be
		* considered invalid and no longer modified or used.
		*/
		private ActivityStarter createStarter() {
		mLastStarter = mFactory.getStarter(this, mService, mService.mStackSupervisor, mInterceptor);
		return mLastStarter;
		}
		ActivityStarter obtainStarter(Intent intent, String reason) {
		final ActivityStarter starter = mFactory.obtainStarter();
		mLastStarter = starter;

		/**
		* TODO(b/64750076): Remove once we directly expose starter interface to callers through
		* {@link #obtainStarter}.
		*/
		int startActivity(IApplicationThread caller, Intent intent, Intent ephemeralIntent,
		String resolvedType, ActivityInfo aInfo, ResolveInfo rInfo,
		IVoiceInteractionSession voiceSession, IVoiceInteractor voiceInteractor,
		IBinder resultTo, String resultWho, int requestCode, int callingPid, int callingUid,
		String callingPackage, int realCallingPid, int realCallingUid, int startFlags,
		ActivityOptions options, boolean ignoreTargetSecurity, boolean componentSpecified,
		ActivityRecord[] outActivity, TaskRecord inTask, String reason) {
		return createStarter().startActivityLocked(caller, intent, ephemeralIntent, resolvedType,
		aInfo, rInfo, voiceSession, voiceInteractor, resultTo, resultWho, requestCode,
		callingPid, callingUid, callingPackage, realCallingPid, realCallingUid, startFlags,
		options, ignoreTargetSecurity, componentSpecified, outActivity, inTask, reason);
		return starter.setIntent(intent).setReason(reason);
		}

		/**
		@@ -170,18 +148,12 @@ public class ActivityStartController {
		void startHomeActivity(Intent intent, ActivityInfo aInfo, String reason) {
		mSupervisor.moveHomeStackTaskToTop(reason);

		final ActivityStarter starter = createStarter();

		mLastHomeActivityStartResult = starter.startActivityLocked(null /caller/, intent,
		null /ephemeralIntent/, null /resolvedType/, aInfo, null /rInfo/,
		null /voiceSession/, null /voiceInteractor/, null /resultTo/,
		null /resultWho/, 0 /requestCode/, 0 /callingPid/, 0 /callingUid/,
		null /callingPackage/, 0 /realCallingPid/, 0 /realCallingUid/,
		0 /startFlags/, null /options/, false /ignoreTargetSecurity/,
		false /componentSpecified/, tmpOutRecord, null /inTask/,
		"startHomeActivity: " + reason);
		mLastHomeActivityStartResult = obtainStarter(intent, "startHomeActivity: " + reason)
		.setOutActivity(tmpOutRecord)
		.setCallingUid(0)
		.setActivityInfo(aInfo)
		.execute();
		mLastHomeActivityStartRecord = tmpOutRecord[0];

		if (mSupervisor.inResumeTopActivity) {
		// If we are in resume section already, home activity will be initialized, but not
		// resumed (to avoid recursive resume) and will stay that way until something pokes it
		@@ -228,9 +200,10 @@ public class ActivityStartController {
		intent.setFlags(FLAG_ACTIVITY_NEW_TASK);
		intent.setComponent(new ComponentName(
		ri.activityInfo.packageName, ri.activityInfo.name));
		startActivity(null, intent, null /ephemeralIntent/, null, ri.activityInfo,
		null /rInfo/, null, null, null, null, 0, 0, 0, null, 0, 0, 0, null,
		false, false, null, null, "startSetupActivity");
		obtainStarter(intent, "startSetupActivity")
		.setCallingUid(0)
		.setActivityInfo(ri.activityInfo)
		.execute();
		}
		}
		}
		@@ -246,9 +219,17 @@ public class ActivityStartController {
		null);

		// TODO: Switch to user app stacks here.
		return startActivityMayWait(null, uid, callingPackage,
		intent, resolvedType, null, null, resultTo, resultWho, requestCode, startFlags,
		null, null, null, bOptions, false, userId, inTask, reason);
		return obtainStarter(intent, reason)
		.setCallingUid(uid)
		.setCallingPackage(callingPackage)
		.setResolvedType(resolvedType)
		.setResultTo(resultTo)
		.setResultWho(resultWho)
		.setRequestCode(requestCode)
		.setStartFlags(startFlags)
		.setMayWait(bOptions, userId)
		.setInTask(inTask)
		.execute();
		}

		final int startActivitiesInPackage(int uid, String callingPackage, Intent[] intents,
		@@ -262,24 +243,6 @@ public class ActivityStartController {
		return ret;
		}

		/**
		* TODO(b/64750076): Remove once we directly expose starter interface to callers through
		* {@link #obtainStarter}.
		*/
		int startActivityMayWait(IApplicationThread caller, int callingUid,
		String callingPackage, Intent intent, String resolvedType,
		IVoiceInteractionSession voiceSession, IVoiceInteractor voiceInteractor,
		IBinder resultTo, String resultWho, int requestCode, int startFlags,
		ProfilerInfo profilerInfo, WaitResult outResult,
		Configuration globalConfig, Bundle bOptions, boolean ignoreTargetSecurity, int userId,
		TaskRecord inTask, String reason) {
		return createStarter().startActivityMayWait(caller, callingUid, callingPackage, intent,
		resolvedType, voiceSession, voiceInteractor, resultTo, resultWho, requestCode,
		startFlags, profilerInfo, outResult, globalConfig, bOptions,
		ignoreTargetSecurity,
		userId, inTask, reason);
		}

		int startActivities(IApplicationThread caller, int callingUid, String callingPackage,
		Intent[] intents, String[] resolvedTypes, IBinder resultTo, Bundle bOptions, int userId,
		String reason) {
		@@ -340,11 +303,23 @@ public class ActivityStartController {

		ActivityOptions options = ActivityOptions.fromBundle(
		i == intents.length - 1 ? bOptions : null);
		int res = startActivity(caller, intent, null /ephemeralIntent/,
		resolvedTypes[i], aInfo, null /rInfo/, null, null, resultTo, null, -1,
		callingPid, callingUid, callingPackage,
		realCallingPid, realCallingUid, 0,
		options, false, componentSpecified, outActivity, null, reason);

		final int res = obtainStarter(intent, reason)
		.setCaller(caller)
		.setResolvedType(resolvedTypes[i])
		.setActivityInfo(aInfo)
		.setResultTo(resultTo)
		.setRequestCode(-1)
		.setCallingPid(callingPid)
		.setCallingUid(callingUid)
		.setCallingPackage(callingPackage)
		.setRealCallingPid(realCallingPid)
		.setRealCallingUid(realCallingUid)
		.setActivityOptions(options)
		.setComponentSpecified(componentSpecified)
		.setOutActivity(outActivity)
		.execute();

		if (res < 0) {
		return res;
		}
		@@ -369,10 +344,11 @@ public class ActivityStartController {
		while (!mPendingActivityLaunches.isEmpty()) {
		final PendingActivityLaunch pal = mPendingActivityLaunches.remove(0);
		final boolean resume = doResume && mPendingActivityLaunches.isEmpty();
		final ActivityStarter starter = createStarter();
		final ActivityStarter starter = obtainStarter(null /* intent */,
		"pendingActivityLaunch");
		try {
		starter.startActivity(pal.r, pal.sourceRecord, null, null, pal.startFlags, resume,
		null, null, null /outRecords/);
		starter.startResolvedActivity(pal.r, pal.sourceRecord, null, null, pal.startFlags,
		resume, null, null, null /* outRecords */);
		} catch (Exception e) {
		Slog.e(TAG, "Exception during pending activity launch pal=" + pal, e);
		pal.sendErrorResult(e.getMessage());

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

+280 −21

File changed.

Preview size limit exceeded, changes collapsed.

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -122,9 +122,14 @@ class AppTaskImpl extends IAppTask.Stub {
		throw new IllegalArgumentException("Bad app thread " + appThread);
		}
		}
		return mService.getActivityStartController().startActivityMayWait(appThread, -1,
		callingPackage, intent, resolvedType, null, null, null, null, 0, 0, null, null,
		null, bOptions, false, callingUser, tr, "AppTaskImpl");

		return mService.getActivityStartController().obtainStarter(intent, "AppTaskImpl")
		.setCaller(appThread)
		.setCallingPackage(callingPackage)
		.setResolvedType(resolvedType)
		.setMayWait(bOptions, callingUser)
		.setInTask(tr)
		.execute();
		}

		@Override