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

Commit a4d8a47f authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Change SystemApi as per API council feedback" into oc-mr1-dev 

am: 252efbcf

Change-Id: I41d4e0d8c0fbf0eb1bdf0d1722da3626e0b97213
parents e1a8030f 252efbcf

api/system-current.txt

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -2261,7 +2261,7 @@ 
         <p>An application requesting this permission is responsible for

         verifying the source and integrity of the update before passing

         it off to the installer components.

         @hide -->

         @SystemApi @hide -->

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

        android:protectionLevel="signature|privileged" />