diff options
| author | 2017-09-19 00:55:43 +0000 | |
|---|---|---|
| committer | 2017-09-19 00:55:43 +0000 | |
| commit | ac49b2c040b17913e6851d1c8b9a9b11f591aaff (patch) | |
| tree | ae96097e5e7f27caa7fa459f044542fd42e9ca3a | |
| parent | c4573ea503f72d213d3f58a0e7226ec96d1d6a71 (diff) | |
| parent | a17abfef562eff5b71e4f66af77dcc8d00f67d01 (diff) | |
Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev am: f7771c9f77
am: a17abfef56
Change-Id: Idf89c63e91b0677799b3b48aff3f19fd08792998
| -rw-r--r-- | core/java/android/app/VrManager.java | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/core/java/android/app/VrManager.java b/core/java/android/app/VrManager.java index 363e20a76a1f..578623892a9d 100644 --- a/core/java/android/app/VrManager.java +++ b/core/java/android/app/VrManager.java @@ -62,7 +62,10 @@ public class VrManager { * @param callback The callback to register. * @hide */ - @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) + @RequiresPermission(anyOf = { + android.Manifest.permission.RESTRICTED_VR_ACCESS, + android.Manifest.permission.ACCESS_VR_STATE + }) public void registerVrStateCallback(VrStateCallback callback, @NonNull Handler handler) { if (callback == null || mCallbackMap.containsKey(callback)) { return; @@ -88,7 +91,10 @@ public class VrManager { * @param callback The callback to deregister. * @hide */ - @RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS) + @RequiresPermission(anyOf = { + android.Manifest.permission.RESTRICTED_VR_ACCESS, + android.Manifest.permission.ACCESS_VR_STATE + }) public void unregisterVrStateCallback(VrStateCallback callback) { CallbackEntry entry = mCallbackMap.remove(callback); if (entry != null) { @@ -110,7 +116,10 @@ public class VrManager { * Returns the current VrMode state. * @hide */ - @RequiresPermission(android.Manifest.permission.ACCESS_VR_STATE) + @RequiresPermission(anyOf = { + android.Manifest.permission.RESTRICTED_VR_ACCESS, + android.Manifest.permission.ACCESS_VR_STATE + }) public boolean getVrModeEnabled() { try { return mService.getVrModeState(); @@ -124,7 +133,10 @@ public class VrManager { * Returns the current VrMode state. * @hide */ - @RequiresPermission(android.Manifest.permission.ACCESS_VR_STATE) + @RequiresPermission(anyOf = { + android.Manifest.permission.RESTRICTED_VR_ACCESS, + android.Manifest.permission.ACCESS_VR_STATE + }) public boolean getPersistentVrModeEnabled() { try { return mService.getPersistentVrModeEnabled(); |