Fallback to global actions if assistant is not available (633d60e7) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PhoneWindowManager.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -734,6 +734,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		private int mCurrentUserId;

		private AssistUtils mAssistUtils;

		// Maps global key codes to the components that will handle them.
		private GlobalKeyManager mGlobalKeyManager;

		@@ -1620,6 +1622,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		}

		private boolean hasAssistant() {
		return mAssistUtils.getAssistComponentForUser(mCurrentUserId) != null;
		}

		private int getResolvedLongPressOnPowerBehavior() {
		if (FactoryTest.isLongPressOnPowerOffEnabled()) {
		return LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM;
		@@ -1627,7 +1633,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		// If the config indicates the assistant behavior but the device isn't yet provisioned, show
		// global actions instead.
		if (mLongPressOnPowerBehavior == LONG_PRESS_POWER_ASSISTANT && !isDeviceProvisioned()) {
		if (mLongPressOnPowerBehavior == LONG_PRESS_POWER_ASSISTANT &&
		(!isDeviceProvisioned() \|\| !hasAssistant())) {
		return LONG_PRESS_POWER_GLOBAL_ACTIONS;
		}

		@@ -2543,6 +2550,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {

		mVibrator = (Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE);

		mAssistUtils = new AssistUtils(mContext);

		mGlobalKeyManager = new GlobalKeyManager(mContext);

		// Controls rotation and the like.