diff --git a/api/system-current.txt b/api/system-current.txt index ef3361bc2f546..6dbd642425902 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -100,6 +100,7 @@ package android { field public static final java.lang.String GET_APP_OPS_STATS = "android.permission.GET_APP_OPS_STATS"; field public static final java.lang.String GET_PACKAGE_IMPORTANCE = "android.permission.GET_PACKAGE_IMPORTANCE"; field public static final java.lang.String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE"; + field public static final java.lang.String GET_PROCESS_STATE_AND_OOM_SCORE = "android.permission.GET_PROCESS_STATE_AND_OOM_SCORE"; field public static final deprecated java.lang.String GET_TASKS = "android.permission.GET_TASKS"; field public static final java.lang.String GET_TOP_ACTIVITY_INFO = "android.permission.GET_TOP_ACTIVITY_INFO"; field public static final java.lang.String GLOBAL_SEARCH = "android.permission.GLOBAL_SEARCH"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 568b601628759..2940f6c7fc10e 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1460,6 +1460,12 @@ android:description="@string/permdesc_killBackgroundProcesses" android:protectionLevel="normal" /> + + + + diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 3ef072369d441..ee0521e7a4e55 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -7233,6 +7233,11 @@ public final class ActivityManagerService extends ActivityManagerNative */ public void getProcessStatesAndOomScoresForPIDs( /*in*/ int[] pids, /*out*/ int[] states, /*out*/ int[] scores) { + if (scores != null) { + enforceCallingPermission(android.Manifest.permission.GET_PROCESS_STATE_AND_OOM_SCORE, + "getProcessStatesAndOomScoresForPIDs()"); + } + if (pids == null) { throw new NullPointerException("pids"); } else if (states == null) {