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

Commit fe511037 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Tweak ActivityManager.getPackageImportance()"

parents c8083b56 9df8f510

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -44027,8 +44027,8 @@ package android.view { 
    field public static final int ROTATION_ANIMATION_CHANGED = 4096; // 0x1000

    field public static final int ROTATION_ANIMATION_CROSSFADE = 1; // 0x1

    field public static final int ROTATION_ANIMATION_JUMPCUT = 2; // 0x2

    field public static final int ROTATION_ANIMATION_SEAMLESS = 3; // 0x3

    field public static final int ROTATION_ANIMATION_ROTATE = 0; // 0x0

    field public static final int ROTATION_ANIMATION_SEAMLESS = 3; // 0x3

    field public static final int SCREEN_BRIGHTNESS_CHANGED = 2048; // 0x800

    field public static final int SCREEN_ORIENTATION_CHANGED = 1024; // 0x400

    field public static final int SOFT_INPUT_ADJUST_NOTHING = 48; // 0x30

api/system-current.txt

+1 −2
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ package android { 
    field public static final java.lang.String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS";

    field public static final java.lang.String GET_ACCOUNTS_PRIVILEGED = "android.permission.GET_ACCOUNTS_PRIVILEGED";

    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";
@@ -47209,8 +47208,8 @@ package android.view { 
    field public static final int ROTATION_ANIMATION_CHANGED = 4096; // 0x1000

    field public static final int ROTATION_ANIMATION_CROSSFADE = 1; // 0x1

    field public static final int ROTATION_ANIMATION_JUMPCUT = 2; // 0x2

    field public static final int ROTATION_ANIMATION_SEAMLESS = 3; // 0x3

    field public static final int ROTATION_ANIMATION_ROTATE = 0; // 0x0

    field public static final int ROTATION_ANIMATION_SEAMLESS = 3; // 0x3

    field public static final int SCREEN_BRIGHTNESS_CHANGED = 2048; // 0x800

    field public static final int SCREEN_ORIENTATION_CHANGED = 1024; // 0x400

    field public static final int SOFT_INPUT_ADJUST_NOTHING = 48; // 0x30

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -44263,8 +44263,8 @@ package android.view { 
    field public static final int ROTATION_ANIMATION_CHANGED = 4096; // 0x1000

    field public static final int ROTATION_ANIMATION_CROSSFADE = 1; // 0x1

    field public static final int ROTATION_ANIMATION_JUMPCUT = 2; // 0x2

    field public static final int ROTATION_ANIMATION_SEAMLESS = 3; // 0x3

    field public static final int ROTATION_ANIMATION_ROTATE = 0; // 0x0

    field public static final int ROTATION_ANIMATION_SEAMLESS = 3; // 0x3

    field public static final int SCREEN_BRIGHTNESS_CHANGED = 2048; // 0x800

    field public static final int SCREEN_ORIENTATION_CHANGED = 1024; // 0x400

    field public static final int SOFT_INPUT_ADJUST_NOTHING = 48; // 0x30

core/java/android/app/ActivityManager.java

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

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.PACKAGE_USAGE_STATS)

    public int getPackageImportance(String packageName) {

        try {

            int procState = ActivityManagerNative.getDefault().getPackageProcessState(packageName,

core/res/AndroidManifest.xml

+0 −5
Original line number Diff line number Diff line
@@ -1712,11 +1712,6 @@ 
    <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"

        android:protectionLevel="signature|privileged" />



    <!-- Allows use of PendingIntent.getIntent().

         @hide -->

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