Merge "Revert "Fixed power manager CTS test."" into pi-dev

2018-04-13 17:33:15 +00:00
parent 07d10c7ac5 4d6b454b45
commit ca1dcfb23e
2 changed files with 0 additions and 6 deletions
--- 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);