From 078f9b98138b52602fb2495107ff1a1a53090757 Mon Sep 17 00:00:00 2001
From: Keun-young Park <keunyoung@google.com>
Date: Wed, 2 Mar 2016 02:18:19 +0000
Subject: [PATCH] Revert "Revert "make isUiModeLocked, isNightModeLocked test
 api""

This reverts commit 92373d23ee13a3d017ee8570229eed164935cd35.

Change-Id: Idf0c3f1d3bed522142f8af3526effe813664d89f
---
 api/current.txt                          | 2 --
 api/system-current.txt                   | 2 --
 core/java/android/app/UiModeManager.java | 5 +++++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index f7a316d063e5b..5742025d1402a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5609,8 +5609,6 @@ 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;
diff --git a/api/system-current.txt b/api/system-current.txt
index b2b59826f3bcb..1a7ed725f72f4 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5741,8 +5741,6 @@ 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;
diff --git a/core/java/android/app/UiModeManager.java b/core/java/android/app/UiModeManager.java
index 56b4249b619d6..1ec68784ecce8 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 @@ 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 {
@@ -286,7 +289,9 @@ 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 {