commit 078f9b98138b52602fb2495107ff1a1a53090757
author Keun-young Park <keunyoung@google.com> Wed Mar 02 02:18:19 2016 +0000
committer Keun-young Park <keunyoung@google.com> Wed Mar 02 02:18:19 2016 +0000
tree 215725eead3408c329da9af5c0049919c4b902e8
parent 92373d23ee13a3d017ee8570229eed164935cd35

Revert "Revert "make isUiModeLocked, isNightModeLocked test api""

This reverts commit 92373d23ee13a3d017ee8570229eed164935cd35.

Change-Id: Idf0c3f1d3bed522142f8af3526effe813664d89f

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index f7a316d..5742025 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5609,8 +5609,6 @@
     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 b2b5982..1a7ed72 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5741,8 +5741,6 @@
     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 56b4249..1ec6878 100644
--- a/core/java/android/app/UiModeManager.java
+++ b/core/java/android/app/UiModeManager.java
@@ -17,6 +17,7 @@
 package android.app;
 
 import android.annotation.IntDef;
+import android.annotation.TestApi;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.os.RemoteException;
@@ -266,7 +267,9 @@
     /**
      * @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 {
@@ -286,7 +289,9 @@
      * 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 {