Merge "Revert "allow locking UI mode and block launching car dock for automotive"" (aa8b1c35) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -5529,8 +5529,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;

+0 −3

Original line number	Diff line number	Diff line
		@@ -133,7 +133,6 @@ 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_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_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_PARENTAL_CONTROLS = "android.permission.MODIFY_PARENTAL_CONTROLS";
		field public static final java.lang.String MODIFY_PHONE_STATE = "android.permission.MODIFY_PHONE_STATE";
		@@ -5649,8 +5648,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;

+0 −10

Original line number	Diff line number	Diff line
		@@ -51,14 +51,4 @@ interface IUiModeManager {
		* 2 for night, and 3 for automatic mode switching.
		*/
		int getNightMode();

		/**
		* Tells if UI mode is locked or not.
		*/
		boolean isUiModeLocked();

		/**
		* Tells if Night mode is locked or not.
		*/
		boolean isNightModeLocked();
		}

+0 −31

Original line number	Diff line number	Diff line
		@@ -233,35 +233,4 @@ public class UiModeManager {
		}
		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;
		}
		}

+0 −7

Original line number	Diff line number	Diff line
		@@ -2712,13 +2712,6 @@
		<permission android:name="android.permission.DISPATCH_NFC_MESSAGE"
		android:protectionLevel="signature\|privileged" />

		<!-- @SystemApi Allows changing day / night mode when system is configured with
		config_lockDayNightMode set to true. If requesting app does not have permission,
		it will be ignored.
		@hide -->
		<permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE"
		android:protectionLevel="signature\|privileged" />

		<!-- The system process is explicitly the only one allowed to launch the
		confirmation UI for full backup/restore -->
		<uses-permission android:name="android.permission.CONFIRM_FULL_BACKUP"/>