Merge "Revert "Introduce Background Activity Launch home mode"" (cbec226d) · Commits · e / os / android_frameworks_base

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

+4 −26

Original line number	Diff line number	Diff line
		@@ -1195,12 +1195,7 @@ class ActivityStarter {
		}
		}

		// Only allow app switching to be resumed if activity is not a restricted background
		// activity, otherwise any background activity started in background task can stop
		// home button protection mode.
		if (!restrictedBgActivity) {
		mService.onStartActivitySetDidAppSwitch();
		}
		mController.doPendingActivityLaunches(false);

		mLastStartActivityResult = startActivityUnchecked(r, sourceRecord, voiceSession,
		@@ -1265,20 +1260,6 @@ class ActivityStarter {
		return false;
		}

		// Always allow home application to start activities.
		if (mService.mHomeProcess != null && callingUid == mService.mHomeProcess.mUid) {
		if (DEBUG_ACTIVITY_STARTS) {
		Slog.d(TAG, "Activity start allowed for home app callingUid (" + callingUid + ")");
		}
		return false;
		}

		// App switching will be allowed if BAL app switching flag is not enabled, or if
		// its app switching rule allows it.
		// This is used to block background activity launch even if the app is still
		// visible to user after user clicking home button.
		final boolean appSwitchAllowed = mService.getBalAppSwitchesAllowed();

		// don't abort if the callingUid has a visible window or is a persistent system process
		final int callingUidProcState = mService.getUidState(callingUid);
		final boolean callingUidHasAnyVisibleWindow =
		@@ -1288,8 +1269,7 @@ class ActivityStarter {
		\|\| callingUidProcState == ActivityManager.PROCESS_STATE_BOUND_TOP;
		final boolean isCallingUidPersistentSystemProcess =
		callingUidProcState <= ActivityManager.PROCESS_STATE_PERSISTENT_UI;
		if ((appSwitchAllowed && callingUidHasAnyVisibleWindow)
		\|\| isCallingUidPersistentSystemProcess) {
		if (callingUidHasAnyVisibleWindow \|\| isCallingUidPersistentSystemProcess) {
		if (DEBUG_ACTIVITY_STARTS) {
		Slog.d(TAG, "Activity start allowed: callingUidHasAnyVisibleWindow = " + callingUid
		+ ", isCallingUidPersistentSystemProcess = "
		@@ -1315,7 +1295,6 @@ class ActivityStarter {
		\|\| realCallingUidProcState <= ActivityManager.PROCESS_STATE_PERSISTENT_UI;
		if (realCallingUid != callingUid) {
		// don't abort if the realCallingUid has a visible window
		// TODO(b/171459802): We should check appSwitchAllowed also
		if (realCallingUidHasAnyVisibleWindow) {
		if (DEBUG_ACTIVITY_STARTS) {
		Slog.d(TAG, "Activity start allowed: realCallingUid (" + realCallingUid
		@@ -1397,7 +1376,7 @@ class ActivityStarter {
		// don't abort if the callerApp or other processes of that uid are allowed in any way
		if (callerApp != null) {
		// first check the original calling process
		if (callerApp.areBackgroundActivityStartsAllowed(appSwitchAllowed)) {
		if (callerApp.areBackgroundActivityStartsAllowed()) {
		if (DEBUG_ACTIVITY_STARTS) {
		Slog.d(TAG, "Background activity start allowed: callerApp process (pid = "
		+ callerApp.getPid() + ", uid = " + callerAppUid + ") is allowed");
		@@ -1410,8 +1389,7 @@ class ActivityStarter {
		if (uidProcesses != null) {
		for (int i = uidProcesses.size() - 1; i >= 0; i--) {
		final WindowProcessController proc = uidProcesses.valueAt(i);
		if (proc != callerApp
		&& proc.areBackgroundActivityStartsAllowed(appSwitchAllowed)) {
		if (proc != callerApp && proc.areBackgroundActivityStartsAllowed()) {
		if (DEBUG_ACTIVITY_STARTS) {
		Slog.d(TAG,
		"Background activity start allowed: process " + proc.getPid()

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

+1 −39

Original line number	Diff line number	Diff line
		@@ -161,11 +161,9 @@ import android.app.WindowConfiguration;
		import android.app.admin.DevicePolicyCache;
		import android.app.assist.AssistContent;
		import android.app.assist.AssistStructure;
		import android.app.compat.CompatChanges;
		import android.app.servertransaction.ClientTransaction;
		import android.app.servertransaction.EnterPipRequestedItem;
		import android.app.usage.UsageStatsManagerInternal;
		import android.compat.annotation.ChangeId;
		import android.content.ActivityNotFoundException;
		import android.content.ComponentName;
		import android.content.ContentResolver;
		@@ -344,12 +342,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		/** This activity is being relaunched due to a free-resize operation. */
		public static final int RELAUNCH_REASON_FREE_RESIZE = 2;

		/**
		* Apps are blocked from starting activities in the foreground after the user presses home.
		*/
		@ChangeId
		public static final long BLOCK_ACTIVITY_STARTS_AFTER_HOME = 159433730L;

		Context mContext;

		/**
		@@ -2635,35 +2627,8 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		throw new SecurityException(msg);
		}

		/**
		* Return true if app switch protection will be handled by background activity launch logic.
		*/
		boolean getBalAppSwitchesProtectionEnabled() {
		return CompatChanges.isChangeEnabled(BLOCK_ACTIVITY_STARTS_AFTER_HOME);
		}

		/**
		* Return true if app switching is allowed.
		*/
		boolean getBalAppSwitchesAllowed() {
		if (getBalAppSwitchesProtectionEnabled()) {
		// Apps no longer able to start BAL again until app switching is resumed.
		return mAppSwitchesAllowedTime == 0;
		} else {
		// Legacy behavior, BAL logic won't block app switching.
		return true;
		}
		}

		boolean checkAppSwitchAllowedLocked(int sourcePid, int sourceUid,
		int callingPid, int callingUid, String name) {

		// Background activity launch logic replaces app switching protection, so allow
		// apps to start activity here now.
		if (getBalAppSwitchesProtectionEnabled()) {
		return true;
		}

		if (mAppSwitchesAllowedTime < SystemClock.uptimeMillis()) {
		return true;
		}
		@@ -4698,12 +4663,9 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
		mAppSwitchesAllowedTime = SystemClock.uptimeMillis() + APP_SWITCH_DELAY_TIME;
		mLastStopAppSwitchesTime = SystemClock.uptimeMillis();
		mDidAppSwitch = false;
		// If BAL app switching enabled, app switches are blocked not delayed.
		if (!getBalAppSwitchesProtectionEnabled()) {
		getActivityStartController().schedulePendingActivityLaunches(APP_SWITCH_DELAY_TIME);
		}
		}
		}

		@Override
		public void resumeAppSwitches() {

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

+21 −25

Original line number	Diff line number	Diff line
		@@ -505,10 +505,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
		}
		}

		boolean areBackgroundActivityStartsAllowed(boolean appSwitchAllowed) {
		// If app switching is not allowed, we ignore all the start activity grace period
		// exception so apps cannot start itself in onPause() after pressing home button.
		if (appSwitchAllowed) {
		boolean areBackgroundActivityStartsAllowed() {
		// allow if any activity in the caller has either started or finished very recently, and
		// it must be started or finished after last stop app switches time.
		final long now = SystemClock.uptimeMillis();
		@@ -532,7 +529,6 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
		}

		}
		}
		// allow if the proc is instrumenting with background activity starts privs
		if (mInstrumentingWithBackgroundActivityStartPrivileges) {
		if (DEBUG_ACTIVITY_STARTS) {
		@@ -543,7 +539,7 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
		return true;
		}
		// allow if the caller has an activity in any foreground task
		if (appSwitchAllowed && hasActivityInVisibleTask()) {
		if (hasActivityInVisibleTask()) {
		if (DEBUG_ACTIVITY_STARTS) {
		Slog.d(TAG, "[WindowProcessController(" + mPid
		+ ")] Activity start allowed: process has activity in foreground task");