commit d74c0a79b5db12659c2750a0ec32da5ff9512ef1
author Karthik Ravi Shankar <karthikrs@google.com> Fri Apr 28 11:21:04 2017 -0700
committer Karthik Ravi Shankar <karthikrs@google.com> Sun Apr 30 22:05:44 2017 -0700
tree a5f949830b047fa242a235dfcfc8e25597b8dd5a
parent ad4c31fecfd75c39d4b9d65b5ea9a75d7f1e34fe

Change android.permission.RESTRICTED_VR_ACCESS to SystemAPI

android.permission.RESTRICTED_VR_ACCESS is currently an open API. But
since it can only be used by System Apps because of it's protection
level which is "signature|preinstalled". Change this to a @SystemApi.

Bug: 37724255
Test: run gts --module GtsPermissionTestCases
1. Run with two apps having android.permission.RESTRICTED_VR_ACCESS
   before change -- fails.
2. Run with two appshaving android.permission.RESTRICTED_VR_ACCESS
   after this change -- passes.

Change-Id: I9e640b0794fa16d03ba22e8aa75175e7e08dd88b
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 122f9b0..8ff59cf 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -121,7 +121,6 @@
     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

diff --git a/api/test-current.txt b/api/test-current.txt
index 4e13e88..26e9ea3 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -121,7 +121,6 @@
     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

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 5b4a454..4b39646 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -3353,6 +3353,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" />