Merge "Renamed setStopBackgroundUsersOnSwitch to setStopUserOnSwitch()" into sc-v2-dev (5908bbe0) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@ package android.app {
		method @RequiresPermission(android.Manifest.permission.RESET_APP_ERRORS) public void resetAppErrors();
		method public static void resumeAppSwitches() throws android.os.RemoteException;
		method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public void scheduleApplicationInfoChanged(java.util.List<java.lang.String>, int);
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public void setStopBackgroundUsersOnSwitch(int);
		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public void setStopUserOnSwitch(int);
		method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean stopUser(int, boolean);
		method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String, @NonNull String);
		method @RequiresPermission(android.Manifest.permission.DUMP) public void waitForBroadcastIdle();
		@@ -128,9 +128,9 @@ package android.app {
		field public static final int PROCESS_CAPABILITY_NONE = 0; // 0x0
		field public static final int PROCESS_STATE_FOREGROUND_SERVICE = 4; // 0x4
		field public static final int PROCESS_STATE_TOP = 2; // 0x2
		field public static final int STOP_BG_USERS_ON_SWITCH_DEFAULT = -1; // 0xffffffff
		field public static final int STOP_BG_USERS_ON_SWITCH_FALSE = 0; // 0x0
		field public static final int STOP_BG_USERS_ON_SWITCH_TRUE = 1; // 0x1
		field public static final int STOP_USER_ON_SWITCH_DEFAULT = -1; // 0xffffffff
		field public static final int STOP_USER_ON_SWITCH_FALSE = 0; // 0x0
		field public static final int STOP_USER_ON_SWITCH_TRUE = 1; // 0x1
		}

		public static class ActivityManager.RunningAppProcessInfo implements android.os.Parcelable {

core/java/android/app/ActivityManager.java

+15 −14

Original line number	Diff line number	Diff line
		@@ -4081,45 +4081,46 @@ public class ActivityManager {
		* @hide
		*/
		@TestApi
		public static final int STOP_BG_USERS_ON_SWITCH_DEFAULT = -1;
		public static final int STOP_USER_ON_SWITCH_DEFAULT = -1;

		/**
		* Overrides value defined by the platform and stop background users on switch.
		* Overrides value defined by the platform and stop user on switch.
		*
		* @hide
		*/
		@TestApi
		public static final int STOP_BG_USERS_ON_SWITCH_TRUE = 1;
		public static final int STOP_USER_ON_SWITCH_TRUE = 1;

		/**
		* Overrides value defined by the platform and don't stop background users on switch.
		* Overrides value defined by the platform and don't stop user on switch.
		*
		* @hide
		*/
		@TestApi
		public static final int STOP_BG_USERS_ON_SWITCH_FALSE = 0;
		public static final int STOP_USER_ON_SWITCH_FALSE = 0;

		/** @hide */
		@IntDef(prefix = { "STOP_BG_USERS_ON_SWITCH_" }, value = {
		STOP_BG_USERS_ON_SWITCH_DEFAULT,
		STOP_BG_USERS_ON_SWITCH_TRUE,
		STOP_BG_USERS_ON_SWITCH_FALSE
		@IntDef(prefix = { "STOP_USER_ON_SWITCH_" }, value = {
		STOP_USER_ON_SWITCH_DEFAULT,
		STOP_USER_ON_SWITCH_TRUE,
		STOP_USER_ON_SWITCH_FALSE
		})
		public @interface StopBgUsersOnSwitch {}
		public @interface StopUserOnSwitch {}

		/**
		* Sets whether background users should be stopped when the current user is switched.
		* Sets whether the current foreground user (and its profiles) should be stopped after switched
		* out.
		*
		* <p>Should only be used on tests.
		* <p>Should only be used on tests. Doesn't apply to {@link UserHandle#SYSTEM system user}.
		*
		* @hide
		*/
		@TestApi
		@RequiresPermission(anyOf = {android.Manifest.permission.MANAGE_USERS,
		android.Manifest.permission.INTERACT_ACROSS_USERS_FULL})
		public void setStopBackgroundUsersOnSwitch(@StopBgUsersOnSwitch int value) {
		public void setStopUserOnSwitch(@StopUserOnSwitch int value) {
		try {
		getService().setStopBackgroundUsersOnSwitch(value);
		getService().setStopUserOnSwitch(value);
		} catch (RemoteException re) {
		throw re.rethrowFromSystemServer();
		}

core/java/android/app/ActivityManagerInternal.java

+4 −3

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

		package android.app;

		import static android.app.ActivityManager.StopBgUsersOnSwitch;
		import static android.app.ActivityManager.StopUserOnSwitch;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -663,9 +663,10 @@ public abstract class ActivityManagerInternal {
		@Nullable VoiceInteractionManagerProvider provider);

		/**
		* Sets whether background users should be stopped when the current user is switched.
		* Sets whether the current foreground user (and its profiles) should be stopped after switched
		* out.
		*/
		public abstract void setStopBackgroundUsersOnSwitch(@StopBgUsersOnSwitch int value);
		public abstract void setStopUserOnSwitch(@StopUserOnSwitch int value);

		/**
		* Provides the interface to communicate between voice interaction manager service and

core/java/android/app/IActivityManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -341,7 +341,7 @@ interface IActivityManager {
		@UnsupportedAppUsage
		boolean switchUser(int userid);
		@UnsupportedAppUsage
		void setStopBackgroundUsersOnSwitch(int value);
		void setStopUserOnSwitch(int value);
		boolean removeTask(int taskId);
		@UnsupportedAppUsage
		void registerProcessObserver(in IProcessObserver observer);

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ import static android.app.ActivityManager.INTENT_SENDER_ACTIVITY;
		import static android.app.ActivityManager.PROCESS_STATE_IMPORTANT_FOREGROUND;
		import static android.app.ActivityManager.PROCESS_STATE_NONEXISTENT;
		import static android.app.ActivityManager.PROCESS_STATE_TOP;
		import static android.app.ActivityManager.StopBgUsersOnSwitch;
		import static android.app.ActivityManager.StopUserOnSwitch;
		import static android.app.ActivityManagerInternal.ALLOW_FULL_ONLY;
		import static android.app.ActivityManagerInternal.ALLOW_NON_FULL;
		import static android.app.AppOpsManager.OP_NONE;
		@@ -15099,8 +15099,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		@Override
		public void setStopBackgroundUsersOnSwitch(@StopBgUsersOnSwitch int value) {
		mUserController.setStopBackgroundUsersOnSwitch(value);
		public void setStopUserOnSwitch(@StopUserOnSwitch int value) {
		mUserController.setStopUserOnSwitch(value);
		}

		@Override
		@@ -16402,8 +16402,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		@Override
		public void setStopBackgroundUsersOnSwitch(int value) {
		ActivityManagerService.this.setStopBackgroundUsersOnSwitch(value);
		public void setStopUserOnSwitch(int value) {
		ActivityManagerService.this.setStopUserOnSwitch(value);
		}
		}