Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8486706a authored by Keun-young Park's avatar Keun-young Park Committed by Android (Google) Code Review
Browse files

Merge "Revert "make isUiModeLocked, isNightModeLocked test api"" into nyc-dev

parents 2657492e 92373d23

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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;

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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;

core/java/android/app/UiModeManager.java

+0 −5
Original line number Diff line number Diff line
@@ -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 {