Merge "Revert "make isUiModeLocked, isNightModeLocked test api"" into nyc-dev
diff --git a/api/current.txt b/api/current.txt
index e444e20..2f57d9a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5608,6 +5608,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;
diff --git a/api/system-current.txt b/api/system-current.txt
index 7389a069e..03e261b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5740,6 +5740,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;
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 {