Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75a85e84 authored by Mark Fasheh's avatar Mark Fasheh Committed by Automerger Merge Worker
Browse files

Merge "Add @TestApi to UidFrozenStateChanged API surface" into udc-dev am:... 

Merge "Add @TestApi to UidFrozenStateChanged API surface" into udc-dev am: 59de0838 am: 4c0987c4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22319600



Change-Id: I6654439accbe18387748c6e06a48a497a78877ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a179d1c1 4c0987c4

core/api/test-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ package android.app { 
    method public void holdLock(android.os.IBinder, int);

    method public static boolean isHighEndGfx();

    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.RESET_APP_ERRORS) public void resetAppErrors();

    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 boolean startUserInBackgroundVisibleOnDisplay(int, int);

    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.DUMP) public void waitForBroadcastIdle();

    field public static final long LOCK_DOWN_CLOSE_SYSTEM_DIALOGS = 174664365L; // 0xa692aadL
@@ -167,6 +169,12 @@ package android.app { 
    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 {

    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);

core/java/android/app/ActivityManager.java

+6 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ public class ActivityManager { 
     * @hide

     */

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @TestApi

    public interface UidFrozenStateChangedCallback {

        /**

         * Indicates that the UID was frozen.
@@ -268,6 +269,7 @@ public class ActivityManager { 
         * @hide

         */

        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

        @TestApi

        int UID_FROZEN_STATE_FROZEN = 1;



        /**
@@ -276,6 +278,7 @@ public class ActivityManager { 
         * @hide

         */

        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

        @TestApi

        int UID_FROZEN_STATE_UNFROZEN = 2;



        /**
@@ -301,6 +304,7 @@ public class ActivityManager { 
         * @hide

         */

        @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

        @TestApi

        void onUidFrozenStateChanged(@NonNull int[] uids,

                @NonNull @UidFrozenState int[] frozenStates);

    }
@@ -320,6 +324,7 @@ public class ActivityManager { 
     */

    @RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @TestApi

    public void registerUidFrozenStateChangedCallback(

            @NonNull Executor executor,

            @NonNull UidFrozenStateChangedCallback callback) {
@@ -351,6 +356,7 @@ public class ActivityManager { 
     */

    @RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    @TestApi

    public void unregisterUidFrozenStateChangedCallback(

            @NonNull UidFrozenStateChangedCallback callback) {

        Preconditions.checkNotNull(callback, "callback cannot be null");