commit 92373d23ee13a3d017ee8570229eed164935cd35
author Keun-young Park <keunyoung@google.com> Tue Mar 01 22:58:15 2016 +0000
committer Keun-young Park <keunyoung@google.com> Tue Mar 01 22:58:15 2016 +0000
tree f8a3d61a22b7846070d3330be4ad6363f3f9c445
parent b493a7dffe1b40fd7d5c22b8ed340c76918bc56b

Revert "make isUiModeLocked, isNightModeLocked test api"

This reverts commit b493a7dffe1b40fd7d5c22b8ed340c76918bc56b.

Change-Id: I651b7ee5b9ca5d7fa1cde1c625bbaa585e186544

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 5742025..f7a316d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5609,6 +5609,8 @@
     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

diff --git a/api/system-current.txt b/api/system-current.txt
index 1a7ed72..b2b5982 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5741,6 +5741,8 @@
     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

diff --git a/core/java/android/app/UiModeManager.java b/core/java/android/app/UiModeManager.java
index 1ec6878..56b4249 100644
--- a/core/java/android/app/UiModeManager.java
+++ b/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 @@
     /**
      * @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 @@
      * 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 {