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

Commit a70ba223 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Change android.permission.RESTRICTED_VR_ACCESS to SystemAPI" into oc-dev 

am: 1c9e549c

Change-Id: I22e49d7404e21917d5e805424cecd2fad50d1aa4
parents 7ae8dd91 1c9e549c

api/current.txt

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

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

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

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

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

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

    field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";

api/test-current.txt

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

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

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

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

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

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

    field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM";

core/res/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -3354,6 +3354,8 @@ 
        android:protectionLevel="signature" />



    <!-- Must be required by system apps when accessing restricted VR APIs.

         @hide

         @SystemApi

         <p>Protection level: signature -->

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

        android:protectionLevel="signature|preinstalled" />