diff options
| author | 2016-03-01 22:59:13 +0000 | |
|---|---|---|
| committer | 2016-03-01 22:59:14 +0000 | |
| commit | 8486706affc6366af57a4e39797f9bf8d2ad68e3 (patch) | |
| tree | eb044cd6b4c9655534575a8ddb62651f59781e43 | |
| parent | 2657492e5ad9db841b3d6d4fe06d38437be08a6d (diff) | |
| parent | 92373d23ee13a3d017ee8570229eed164935cd35 (diff) | |
Merge "Revert "make isUiModeLocked, isNightModeLocked test api"" into nyc-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/app/UiModeManager.java | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index e444e20b47cd..2f57d9a942ca 100644 --- a/api/current.txt +++ b/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; diff --git a/api/system-current.txt b/api/system-current.txt index 7389a069e8dd..03e261bdf76d 100644 --- a/api/system-current.txt +++ b/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; diff --git a/core/java/android/app/UiModeManager.java b/core/java/android/app/UiModeManager.java index 1ec68784ecce..56b4249b619d 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 @@ 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 { |