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

Commit 1be3a1cf authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add permission to prevent third-parth apps from querying OOM scores"

parents 9bc00f19 8e4f4b3d

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -1460,6 +1460,12 @@ 
        android:description="@string/permdesc_killBackgroundProcesses"

        android:protectionLevel="normal" />



    <!-- @SystemApi @hide Allows an application to query process states and current

         OOM adjustment scores.

         <p>Not for use by third-party applications. -->

    <permission android:name="android.permission.GET_PROCESS_STATE_AND_OOM_SCORE"

        android:protectionLevel="signature|privileged|development" />



    <!-- @SystemApi @hide Allows an application to retrieve a package's importance.

         This permission is not available to third party applications. -->

    <permission android:name="android.permission.GET_PACKAGE_IMPORTANCE"

data/etc/platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ 
    <assign-permission name="android.permission.WAKE_LOCK" uid="media" />

    <assign-permission name="android.permission.UPDATE_DEVICE_STATS" uid="media" />

    <assign-permission name="android.permission.UPDATE_APP_OPS_STATS" uid="media" />

    <assign-permission name="android.permission.GET_PROCESS_STATE_AND_OOM_SCORE" uid="media" />



    <assign-permission name="android.permission.ACCESS_SURFACE_FLINGER" uid="graphics" />

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

+5 −0
Original line number Diff line number Diff line
@@ -7238,6 +7238,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) {