Merge "Add @TestApi to UidFrozenStateChanged API surface" into udc-dev am: 59de083813 (8230f6f1) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+8 −0

core/java/android/app/ActivityManager.java

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -256,6 +256,7 @@ public class ActivityManager {
	* @hide		* @hide
	*/		*/
	@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
			@TestApi
	public interface UidFrozenStateChangedCallback {		public interface UidFrozenStateChangedCallback {
	/**		/**
	* Indicates that the UID was frozen.		* Indicates that the UID was frozen.
	@@ -263,6 +264,7 @@ public class ActivityManager {
	* @hide		* @hide
	*/		*/
	@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
			@TestApi
	int UID_FROZEN_STATE_FROZEN = 1;		int UID_FROZEN_STATE_FROZEN = 1;

	/**		/**
	@@ -271,6 +273,7 @@ public class ActivityManager {
	* @hide		* @hide
	*/		*/
	@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
			@TestApi
	int UID_FROZEN_STATE_UNFROZEN = 2;		int UID_FROZEN_STATE_UNFROZEN = 2;

	/**		/**
	@@ -296,6 +299,7 @@ public class ActivityManager {
	* @hide		* @hide
	*/		*/
	@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
			@TestApi
	void onUidFrozenStateChanged(@NonNull int[] uids,		void onUidFrozenStateChanged(@NonNull int[] uids,
	@NonNull @UidFrozenState int[] frozenStates);		@NonNull @UidFrozenState int[] frozenStates);
	}		}
	@@ -315,6 +319,7 @@ public class ActivityManager {
	*/		*/
	@RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)		@RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)
	@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
			@TestApi
	public void registerUidFrozenStateChangedCallback(		public void registerUidFrozenStateChangedCallback(
	@NonNull Executor executor,		@NonNull Executor executor,
	@NonNull UidFrozenStateChangedCallback callback) {		@NonNull UidFrozenStateChangedCallback callback) {
	@@ -346,6 +351,7 @@ public class ActivityManager {
	*/		*/
	@RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)		@RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)
	@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
			@TestApi
	public void unregisterUidFrozenStateChangedCallback(		public void unregisterUidFrozenStateChangedCallback(
	@NonNull UidFrozenStateChangedCallback callback) {		@NonNull UidFrozenStateChangedCallback callback) {
	Preconditions.checkNotNull(callback, "callback cannot be null");		Preconditions.checkNotNull(callback, "callback cannot be null");

Original line number	Original line	Diff line number	Diff line
	@@ -137,6 +137,7 @@ package android.app {
	method public void holdLock(android.os.IBinder, int);		method public void holdLock(android.os.IBinder, int);
	method public static boolean isHighEndGfx();		method public static boolean isHighEndGfx();
	method public void notifySystemPropertiesChanged();		method public void notifySystemPropertiesChanged();
			method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void registerUidFrozenStateChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.app.ActivityManager.UidFrozenStateChangedCallback);
	method @RequiresPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER) public void removeHomeVisibilityListener(@NonNull android.app.HomeVisibilityListener);		method @RequiresPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER) public void removeHomeVisibilityListener(@NonNull android.app.HomeVisibilityListener);
	method @RequiresPermission(android.Manifest.permission.RESET_APP_ERRORS) public void resetAppErrors();		method @RequiresPermission(android.Manifest.permission.RESET_APP_ERRORS) public void resetAppErrors();
	method public static void resumeAppSwitches() throws android.os.RemoteException;		method public static void resumeAppSwitches() throws android.os.RemoteException;
	@@ -144,6 +145,7 @@ package android.app {
	method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public void setStopUserOnSwitch(int);		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public void setStopUserOnSwitch(int);
	method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public boolean startUserInBackgroundVisibleOnDisplay(int, int);		method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public boolean startUserInBackgroundVisibleOnDisplay(int, int);
	method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean stopUser(int, boolean);		method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean stopUser(int, boolean);
			method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void unregisterUidFrozenStateChangedCallback(@NonNull android.app.ActivityManager.UidFrozenStateChangedCallback);
	method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String, @NonNull String);		method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String, @NonNull String);
	method @RequiresPermission(android.Manifest.permission.DUMP) public void waitForBroadcastIdle();		method @RequiresPermission(android.Manifest.permission.DUMP) public void waitForBroadcastIdle();
	field public static final long LOCK_DOWN_CLOSE_SYSTEM_DIALOGS = 174664365L; // 0xa692aadL		field public static final long LOCK_DOWN_CLOSE_SYSTEM_DIALOGS = 174664365L; // 0xa692aadL
	@@ -167,6 +169,12 @@ package android.app {
	method @Nullable public String getIconResourcePackage();		method @Nullable public String getIconResourcePackage();
	}		}

			public static interface ActivityManager.UidFrozenStateChangedCallback {
			method public void onUidFrozenStateChanged(@NonNull int[], @NonNull int[]);
			field public static final int UID_FROZEN_STATE_FROZEN = 1; // 0x1
			field public static final int UID_FROZEN_STATE_UNFROZEN = 2; // 0x2
			}

	public class ActivityOptions extends android.app.ComponentOptions {		public class ActivityOptions extends android.app.ComponentOptions {
	method public boolean isEligibleForLegacyPermissionPrompt();		method public boolean isEligibleForLegacyPermissionPrompt();
	method @NonNull public static android.app.ActivityOptions makeCustomAnimation(@NonNull android.content.Context, int, int, int, @Nullable android.os.Handler, @Nullable android.app.ActivityOptions.OnAnimationStartedListener, @Nullable android.app.ActivityOptions.OnAnimationFinishedListener);		method @NonNull public static android.app.ActivityOptions makeCustomAnimation(@NonNull android.content.Context, int, int, int, @Nullable android.os.Handler, @Nullable android.app.ActivityOptions.OnAnimationStartedListener, @Nullable android.app.ActivityOptions.OnAnimationFinishedListener);