Merge "Ignore exception when checking isRotationLocked()" into main (b46e2441) · Commits · e / os / android_frameworks_base

packages/SystemUI/shared/src/com/android/systemui/shared/rotation/RotationButtonController.java

+24 −4

Original line number	Diff line number	Diff line
		@@ -283,12 +283,28 @@ public class RotationButtonController {
		}

		public void setRotationLockedAtAngle(int rotationSuggestion, String caller) {
		RotationPolicy.setRotationLockAtAngle(mContext, /* enabled= */ isRotationLocked(),
		final Boolean isLocked = isRotationLocked();
		if (isLocked == null) {
		// Ignore if we can't read the setting for the current user
		return;
		}
		RotationPolicy.setRotationLockAtAngle(mContext, /* enabled= */ isLocked,
		/* rotation= */ rotationSuggestion, caller);
		}

		public boolean isRotationLocked() {
		/**
		* @return whether rotation is currently locked, or <code>null</code> if the setting couldn't
		* be read
		*/
		public Boolean isRotationLocked() {
		try {
		return RotationPolicy.isRotationLocked(mContext);
		} catch (SecurityException e) {
		// TODO(b/279561841): RotationPolicy uses the current user to resolve the setting which
		// may change before the rotation watcher can be unregistered
		Log.e(TAG, "Failed to get isRotationLocked", e);
		return null;
		}
		}

		public void setRotateSuggestionButtonState(boolean visible) {
		@@ -462,7 +478,11 @@ public class RotationButtonController {

		// If the screen rotation changes while locked, potentially update lock to flow with
		// new screen rotation and hide any showing suggestions.
		boolean rotationLocked = isRotationLocked();
		Boolean rotationLocked = isRotationLocked();
		if (rotationLocked == null) {
		// Ignore if we can't read the setting for the current user
		return;
		}
		// The isVisible check makes the rotation button disappear when we are not locked
		// (e.g. for tabletop auto-rotate).
		if (rotationLocked \|\| mRotationButton.isVisible()) {