Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev

Browse Source 
am: f7771c9f77

Change-Id: Ib569f91269f75ee288dc515505f9a46b0dbe61c9
This commit is contained in:
Santos Cordon
2017-09-19 00:47:52 +00:00
committed by android-build-merger
parent 21310fde50 f7771c9f77
commit a17abfef56
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/app/VrManager.java
View File

@@ -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();