Merge "Restrict activity launch when caller is running in the background" into udc-dev (82456ff9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+10 −7

Original line number	Diff line number	Diff line
		@@ -1412,6 +1412,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {

		final long origId = Binder.clearCallingIdentity();
		// TODO(b/64750076): Check if calling pid should really be -1.
		try {
		if (options == null) {
		options = new SafeActivityOptions(ActivityOptions.makeBasic());
		}
		options.getOptions(r).setAvoidMoveToFront();
		final int res = getActivityStartController()
		.obtainStarter(intent, "startNextMatchingActivity")
		.setCaller(r.app.getThread())
		@@ -1428,13 +1433,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		.setRealCallingUid(r.launchedFromUid)
		.setActivityOptions(options)
		.execute();
		Binder.restoreCallingIdentity(origId);

		r.finishing = wasFinishing;
		if (res != ActivityManager.START_SUCCESS) {
		return false;
		return res == ActivityManager.START_SUCCESS;
		} finally {
		Binder.restoreCallingIdentity(origId);
		}
		return true;
		}
		}