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

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

Merge "allow locking UI mode and block launching car dock for automotive"

parents 9643e739 a771049b

api/current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -5530,6 +5530,8 @@ package android.app { 
    method public void enableCarMode(int);

    method public void enableCarMode(int);

    method public int getCurrentModeType();

    method public int getCurrentModeType();

    method public int getNightMode();

    method public int getNightMode();

    method public boolean isNightModeLocked();

    method public boolean isUiModeLocked();

    method public void setNightMode(int);

    method public void setNightMode(int);

    field public static java.lang.String ACTION_ENTER_CAR_MODE;

    field public static java.lang.String ACTION_ENTER_CAR_MODE;

    field public static java.lang.String ACTION_ENTER_DESK_MODE;

    field public static java.lang.String ACTION_ENTER_DESK_MODE;

api/system-current.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -134,6 +134,7 @@ package android { 
    field public static final java.lang.String MODIFY_AUDIO_ROUTING = "android.permission.MODIFY_AUDIO_ROUTING";

    field public static final java.lang.String MODIFY_AUDIO_ROUTING = "android.permission.MODIFY_AUDIO_ROUTING";

    field public static final java.lang.String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS";

    field public static final java.lang.String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS";

    field public static final java.lang.String MODIFY_CELL_BROADCASTS = "android.permission.MODIFY_CELL_BROADCASTS";

    field public static final java.lang.String MODIFY_CELL_BROADCASTS = "android.permission.MODIFY_CELL_BROADCASTS";

    field public static final java.lang.String MODIFY_DAY_NIGHT_MODE = "android.permission.MODIFY_DAY_NIGHT_MODE";

    field public static final java.lang.String MODIFY_NETWORK_ACCOUNTING = "android.permission.MODIFY_NETWORK_ACCOUNTING";

    field public static final java.lang.String MODIFY_NETWORK_ACCOUNTING = "android.permission.MODIFY_NETWORK_ACCOUNTING";

    field public static final java.lang.String MODIFY_PARENTAL_CONTROLS = "android.permission.MODIFY_PARENTAL_CONTROLS";

    field public static final java.lang.String MODIFY_PARENTAL_CONTROLS = "android.permission.MODIFY_PARENTAL_CONTROLS";

    field public static final java.lang.String MODIFY_PHONE_STATE = "android.permission.MODIFY_PHONE_STATE";

    field public static final java.lang.String MODIFY_PHONE_STATE = "android.permission.MODIFY_PHONE_STATE";
@@ -5649,6 +5650,8 @@ package android.app { 
    method public void enableCarMode(int);

    method public void enableCarMode(int);

    method public int getCurrentModeType();

    method public int getCurrentModeType();

    method public int getNightMode();

    method public int getNightMode();

    method public boolean isNightModeLocked();

    method public boolean isUiModeLocked();

    method public void setNightMode(int);

    method public void setNightMode(int);

    field public static java.lang.String ACTION_ENTER_CAR_MODE;

    field public static java.lang.String ACTION_ENTER_CAR_MODE;

    field public static java.lang.String ACTION_ENTER_DESK_MODE;

    field public static java.lang.String ACTION_ENTER_DESK_MODE;

api/test-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -5530,6 +5530,8 @@ package android.app { 
    method public void enableCarMode(int);

    method public void enableCarMode(int);

    method public int getCurrentModeType();

    method public int getCurrentModeType();

    method public int getNightMode();

    method public int getNightMode();

    method public boolean isNightModeLocked();

    method public boolean isUiModeLocked();

    method public void setNightMode(int);

    method public void setNightMode(int);

    field public static java.lang.String ACTION_ENTER_CAR_MODE;

    field public static java.lang.String ACTION_ENTER_CAR_MODE;

    field public static java.lang.String ACTION_ENTER_DESK_MODE;

    field public static java.lang.String ACTION_ENTER_DESK_MODE;

core/java/android/app/IUiModeManager.aidl

+10 −0
Original line number Original line Diff line number Diff line
@@ -51,4 +51,14 @@ interface IUiModeManager { 
     * 2 for night, and 3 for automatic mode switching.

     * 2 for night, and 3 for automatic mode switching.

     */

     */

    int getNightMode();

    int getNightMode();



    /**

     * Tells if UI mode is locked or not.

     */

    boolean isUiModeLocked();



    /**

     * Tells if Night mode is locked or not.

     */

    boolean isNightModeLocked();

}
 
}

core/java/android/app/UiModeManager.java

+31 −0
Original line number Original line Diff line number Diff line
@@ -233,4 +233,35 @@ public class UiModeManager { 
        }

        }

        return -1;

        return -1;

    }

    }



    /**

     * @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.

     */

    public boolean isUiModeLocked() {

        if (mService != null) {

            try {

                return mService.isUiModeLocked();

            } catch (RemoteException e) {

                Log.e(TAG, "isUiModeLocked: RemoteException", e);

            }

        }

        return true;

    }



    /**

     * @return If Night mode is locked or not. When Night mode is locked, changing Night mode

     *         is only allowed to privileged system components and normal application's call

     *         to change Night mode using {@link #setNightMode(int)} will silently fail.

     */

    public boolean isNightModeLocked() {

        if (mService != null) {

            try {

                return mService.isNightModeLocked();

            } catch (RemoteException e) {

                Log.e(TAG, "isNightModeLocked: RemoteException", e);

            }

        }

        return true;

    }

}
 
}