Merge "Rename isSdkSandboxActivity -> isSdkSandboxActivityIntent" into main (b5fca840) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -2292,7 +2292,8 @@ public final class ActivityThread extends ClientTransactionHandler
		case DUMP_HEAP: return "DUMP_HEAP";
		case DUMP_ACTIVITY: return "DUMP_ACTIVITY";
		case SET_CORE_SETTINGS: return "SET_CORE_SETTINGS";
		case UPDATE_PACKAGE_COMPATIBILITY_INFO: return "UPDATE_PACKAGE_COMPATIBILITY_INFO";
		case UPDATE_PACKAGE_COMPATIBILITY_INFO:
		return "UPDATE_PACKAGE_COMPATIBILITY_INFO";
		case DUMP_PROVIDER: return "DUMP_PROVIDER";
		case UNSTABLE_PROVIDER_DIED: return "UNSTABLE_PROVIDER_DIED";
		case REQUEST_ASSIST_CONTEXT_EXTRAS: return "REQUEST_ASSIST_CONTEXT_EXTRAS";
		@@ -3804,7 +3805,7 @@ public final class ActivityThread extends ClientTransactionHandler

		boolean isSandboxActivityContext =
		sandboxActivitySdkBasedContext()
		&& SdkSandboxActivityAuthority.isSdkSandboxActivity(
		&& SdkSandboxActivityAuthority.isSdkSandboxActivityIntent(
		mSystemContext, r.intent);
		boolean isSandboxedSdkContextUsed = false;
		ContextImpl activityBaseContext;

core/java/android/content/Intent.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -12606,8 +12606,11 @@ public class Intent implements Parcelable, Cloneable {
		}

		/**
		* @deprecated Use {@link SdkSandboxActivityAuthority#isSdkSandboxActivity} instead.
		* @deprecated Use {@link SdkSandboxActivityAuthority#isSdkSandboxActivityIntent} instead.
		* Once the other API is finalized this method will be removed.
		*
		* TODO(b/300059435): remove as part of the cleanup.
		*
		* @hide
		*/
		@Deprecated

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_FOCUS;
		import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_IMMERSIVE;
		import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_LOCKTASK;
		import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_TASKS;
		import static com.android.sdksandbox.flags.Flags.sandboxActivitySdkBasedContext;
		import static com.android.server.am.ActivityManagerService.STOCK_PM_FLAGS;
		import static com.android.server.am.ActivityManagerServiceDumpActivitiesProto.ROOT_WINDOW_CONTAINER;
		import static com.android.server.am.ActivityManagerServiceDumpProcessesProto.CONFIG_WILL_CHANGE;
		@@ -125,7 +126,6 @@ import static com.android.server.wm.RootWindowContainer.MATCH_ATTACHED_TASK_OR_R
		import static com.android.server.wm.Task.REPARENT_KEEP_ROOT_TASK_AT_FRONT;
		import static com.android.server.wm.WindowManagerService.MY_PID;
		import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL;
		import static com.android.sdksandbox.flags.Flags.sandboxActivitySdkBasedContext;

		import android.Manifest;
		import android.annotation.IntDef;
		@@ -1261,10 +1261,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		true /validateIncomingUser/);
		}

		static boolean isSdkSandboxActivity(Context context, Intent intent) {
		static boolean isSdkSandboxActivityIntent(Context context, Intent intent) {
		return intent != null
		&& (sandboxActivitySdkBasedContext()
		? SdkSandboxActivityAuthority.isSdkSandboxActivity(context, intent)
		? SdkSandboxActivityAuthority.isSdkSandboxActivityIntent(context, intent)
		: intent.isSandboxActivity(context));
		}

		@@ -1278,7 +1278,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		assertPackageMatchesCallingUid(callingPackage);
		enforceNotIsolatedCaller("startActivityAsUser");

		if (isSdkSandboxActivity(mContext, intent)) {
		if (isSdkSandboxActivityIntent(mContext, intent)) {
		SdkSandboxManagerLocal sdkSandboxManagerLocal = LocalManagerRegistry.getManager(
		SdkSandboxManagerLocal.class);
		sdkSandboxManagerLocal.enforceAllowedToHostSandboxedActivity(

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1085,7 +1085,8 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
		// Remove the process record so it won't be considered as alive.
		mService.mProcessNames.remove(wpc.mName, wpc.mUid);
		mService.mProcessMap.remove(wpc.getPid());
		} else if (ActivityTaskManagerService.isSdkSandboxActivity(mService.mContext, r.intent)) {
		} else if (ActivityTaskManagerService.isSdkSandboxActivityIntent(
		mService.mContext, r.intent)) {
		Slog.e(TAG, "Abort sandbox activity launching as no sandbox process to host it.");
		r.finishIfPossible("No sandbox process for the activity", false /* oomAdj */);
		r.launchFailed = true;