summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2018-04-13 17:33:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-04-13 17:33:15 +0000
commitca1dcfb23e6a02eb4ea6dd8eaff1074086b6bb86 (patch)
tree1e99657383eafc7499774930f9d4718b176a3447 /core/java
parent07d10c7ac59479094e4923bfaf20a26eea27704f (diff)
parent4d6b454b455008376a5aa2928180a7e60e77b3ed (diff)
Merge "Revert "Fixed power manager CTS test."" into pi-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/os/PowerManager.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java
index 9c258487447e..c00100b7e0cf 100644
--- a/core/java/android/os/PowerManager.java
+++ b/core/java/android/os/PowerManager.java
@@ -21,7 +21,6 @@ import android.annotation.RequiresPermission;
import android.annotation.SdkConstant;
import android.annotation.SystemApi;
import android.annotation.SystemService;
-import android.annotation.TestApi;
import android.content.Context;
import android.util.Log;
import android.util.proto.ProtoOutputStream;
@@ -961,7 +960,6 @@ public final class PowerManager {
*
* @hide Requires signature permission.
*/
- @TestApi
public void nap(long time) {
try {
mService.nap(time);