From 4d6b454b455008376a5aa2928180a7e60e77b3ed Mon Sep 17 00:00:00 2001
From: Michael Wright <michaelwr@google.com>
Date: Fri, 13 Apr 2018 17:29:37 +0000
Subject: [PATCH] Revert "Fixed power manager CTS test."

This reverts commit 48fed61da3f3671850aae3c521a3e6f088169de2.

Reason for revert: m checkbuild failing
Bug: 77907164

Change-Id: I7f75dafc049581a7a5393c3cf0108c488eecaf48
---
 api/test-current.txt                   | 4 ----
 core/java/android/os/PowerManager.java | 2 --
 2 files changed, 6 deletions(-)

diff --git a/api/test-current.txt b/api/test-current.txt
index 2ef20253e950f..ea8e5dbb25e08 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -604,10 +604,6 @@ package android.os {
     field public static final android.os.Parcelable.Creator<android.os.IncidentReportArgs> CREATOR;
   }
 
-  public final class PowerManager {
-    method public void nap(long);
-  }
-
   public class Process {
     method public static final int getThreadScheduler(int) throws java.lang.IllegalArgumentException;
   }
diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java
index 9c258487447e1..c00100b7e0cf1 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);