diff options
| -rw-r--r-- | core/api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 2c1f2fd0c1cd..708f10e27bcc 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -561,7 +561,7 @@ package android.app { public class ActivityManager { method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void addOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener, int); - method @FlaggedApi("android.app.uid_importance_listener_for_uids") @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void addOnUidImportanceListener(@NonNull android.app.ActivityManager.OnUidImportanceListener, int, @Nullable int[]); + method @FlaggedApi("android.app.uid_importance_listener_for_uids") @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void addOnUidImportanceListener(@NonNull android.app.ActivityManager.OnUidImportanceListener, int, @NonNull int[]); method @RequiresPermission(android.Manifest.permission.FORCE_STOP_PACKAGES) public void forceStopPackage(String); method @FlaggedApi("android.app.get_binding_uid_importance") @RequiresPermission(android.Manifest.permission.GET_BINDING_UID_IMPORTANCE) public int getBindingUidImportance(int); method @RequiresPermission(anyOf={"android.permission.INTERACT_ACROSS_USERS", "android.permission.INTERACT_ACROSS_USERS_FULL"}) public static int getCurrentUser(); diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 9d20f3c47bb5..6285eb3b2096 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -107,6 +107,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Locale; +import java.util.Objects; import java.util.concurrent.Executor; import java.util.function.Consumer; @@ -4440,8 +4441,7 @@ public class ActivityManager { * is used here, you will receive a call each time a uids importance transitions between * being <= {@link RunningAppProcessInfo#IMPORTANCE_PERCEPTIBLE} and * > {@link RunningAppProcessInfo#IMPORTANCE_PERCEPTIBLE}. - * @param uids The UIDs that this listener is interested with. A {@code null} value means - * all UIDs will be monitored by this listener, this will be equivalent to the + * @param uids The UIDs that this listener is interested with. * {@link #addOnUidImportanceListener(OnUidImportanceListener, int)} in this case. * * <p>Calling this API with the same instance of {@code listener} without @@ -4456,7 +4456,9 @@ public class ActivityManager { @SuppressLint("SamShouldBeLast") @RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS) public void addOnUidImportanceListener(@NonNull OnUidImportanceListener listener, - @RunningAppProcessInfo.Importance int importanceCutpoint, @Nullable int[] uids) { + @RunningAppProcessInfo.Importance int importanceCutpoint, @NonNull int[] uids) { + Objects.requireNonNull(listener); + Objects.requireNonNull(uids); addOnUidImportanceListenerInternal(listener, importanceCutpoint, uids); } |