summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adrian Roos <roosa@google.com> 2018-12-13 15:25:59 -0800
committer android-build-merger <android-build-merger@google.com> 2018-12-13 15:25:59 -0800
commitfc52100419172d91b3c305427871e88b954c095f (patch)
treed7c2557ef130b087ea608405da7ebf56cacc4a3d
parenta0909a416f57ac80a9b9fabb241a659163a7335b (diff)
parent84f03da369649ad1e4a944853d087521d6f8815c (diff)
Merge "API: Clean up redundant and ineffective usages of SystemApi and TestApi (2/2)" am: a48e431113 am: a11f1d2d50
am: 84f03da369 Change-Id: I4c746b570470301f076efca9d4897cb2032a3732
-rw-r--r--core/java/android/app/VrManager.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/app/VrManager.java b/core/java/android/app/VrManager.java
index 6248e7c38ec1..5b87de48210f 100644
--- a/core/java/android/app/VrManager.java
+++ b/core/java/android/app/VrManager.java
@@ -5,7 +5,6 @@ import android.annotation.NonNull;
import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.annotation.SystemService;
-import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
import android.content.ComponentName;
import android.content.Context;
@@ -222,7 +221,6 @@ public class VrManager {
* @param componentName ComponentName of a VR InputMethod that should be set as selected
* input by InputMethodManagerService.
*/
- @TestApi
@RequiresPermission(android.Manifest.permission.RESTRICTED_VR_ACCESS)
public void setVrInputMethod(ComponentName componentName) {
try {