Merge "Add setDisabledForSimNetworkLock to StatusBarManager" (33d3e859) · Commits · e / os / android_frameworks_base

api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -596,6 +596,7 @@ package android.app {
		public class StatusBarManager {
		method @NonNull @RequiresPermission(android.Manifest.permission.STATUS_BAR) public android.app.StatusBarManager.DisableInfo getDisableInfo();
		method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setDisabledForSetup(boolean);
		method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setDisabledForSimNetworkLock(boolean);
		}

		public static final class StatusBarManager.DisableInfo {

+1 −0

Original line number	Diff line number	Diff line
		@@ -352,6 +352,7 @@ package android.app {
		public class StatusBarManager {
		method @NonNull @RequiresPermission(android.Manifest.permission.STATUS_BAR) public android.app.StatusBarManager.DisableInfo getDisableInfo();
		method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setDisabledForSetup(boolean);
		method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setDisabledForSimNetworkLock(boolean);
		}

		public static final class StatusBarManager.DisableInfo {

+29 −0

Original line number	Diff line number	Diff line
		@@ -153,6 +153,11 @@ public class StatusBarManager {
		*/
		public static final int DEFAULT_SETUP_DISABLE2_FLAGS = DISABLE2_ROTATE_SUGGESTIONS;

		/**
		* disable flags to be applied when the device is sim-locked.
		*/
		private static final int DEFAULT_SIM_LOCKED_DISABLED_FLAGS = DISABLE_EXPAND;

		/** @hide */
		public static final int NAVIGATION_HINT_BACK_ALT = 1 << 0;
		/** @hide */
		@@ -384,6 +389,30 @@ public class StatusBarManager {
		}
		}

		/**
		* Enable or disable expansion of the status bar. When the device is SIM-locked, the status
		* bar should not be expandable.
		*
		* @param disabled If {@code true}, the status bar will be set to non-expandable. If
		* {@code false}, re-enables expansion of the status bar.
		* @hide
		*/
		@SystemApi
		@TestApi
		@RequiresPermission(android.Manifest.permission.STATUS_BAR)
		public void setDisabledForSimNetworkLock(boolean disabled) {
		try {
		final int userId = Binder.getCallingUserHandle().getIdentifier();
		final IStatusBarService svc = getService();
		if (svc != null) {
		svc.disableForUser(disabled ? DEFAULT_SIM_LOCKED_DISABLED_FLAGS : DISABLE_NONE,
		mToken, mContext.getPackageName(), userId);
		}
		} catch (RemoteException ex) {
		throw ex.rethrowFromSystemServer();
		}
		}

		/**
		* Get this app's currently requested disabled components
		*