Merge "Revert "make isUiModeLocked, isNightModeLocked test api"" into nyc-dev

am: 8486706aff

* commit '8486706affc6366af57a4e39797f9bf8d2ad68e3':
  Revert "make isUiModeLocked, isNightModeLocked test api"

api/current.txt

@@ -5608,6 +5608,8 @@ package android.app {
     method public void enableCarMode(int);
     method public int getCurrentModeType();
     method public int getNightMode();
+    method public boolean isNightModeLocked();
+    method public boolean isUiModeLocked();
     method public void setNightMode(int);
     field public static java.lang.String ACTION_ENTER_CAR_MODE;
     field public static java.lang.String ACTION_ENTER_DESK_MODE;

api/system-current.txt

@@ -5740,6 +5740,8 @@ package android.app {
     method public void enableCarMode(int);
     method public int getCurrentModeType();
     method public int getNightMode();
+    method public boolean isNightModeLocked();
+    method public boolean isUiModeLocked();
     method public void setNightMode(int);
     field public static java.lang.String ACTION_ENTER_CAR_MODE;
     field public static java.lang.String ACTION_ENTER_DESK_MODE;

core/java/android/app/UiModeManager.java

@@ -17,7 +17,6 @@
 package android.app;
 
 import android.annotation.IntDef;
-import android.annotation.TestApi;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.os.RemoteException;
@@ -267,9 +266,7 @@ public class UiModeManager {
     /**
      * @return If UI mode is locked or not. When UI mode is locked, calls to change UI mode
      *         like {@link #enableCarMode(int)} will silently fail.
-     * @hide
      */
-    @TestApi
     public boolean isUiModeLocked() {
         if (mService != null) {
             try {
@@ -289,9 +286,7 @@ public class UiModeManager {
      * mode will fail silently.
      *
      * @return {@code true} if night mode is locked or {@code false} otherwise
-     * @hide
      */
-    @TestApi
     public boolean isNightModeLocked() {
         if (mService != null) {
             try {