Merge "Fix DISALLOW_SAFE_BOOT on HSUM" into main (503385c4) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialogLite.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -954,7 +954,8 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
		return false;
		}
		mUiEventLogger.log(GlobalActionsEvent.GA_SHUTDOWN_LONG_PRESS);
		if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT)) {
		if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT,
		getCurrentUser().getUserHandle())) {
		mWindowManagerFuncs.reboot(true);
		return true;
		}
		@@ -1098,7 +1099,8 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene
		return false;
		}
		mUiEventLogger.log(GlobalActionsEvent.GA_REBOOT_LONG_PRESS);
		if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT)) {
		if (!mUserManager.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT,
		getCurrentUser().getUserHandle())) {
		mWindowManagerFuncs.reboot(true);
		return true;
		}