Merge "Don't access keyguard from instant apps." into pi-dev am: e7bd4e7e8f (398780ae) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/PhoneWindow.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -2031,7 +2031,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		* Do this in onKeyUp since the Search key is also used for
		* chording quick launch shortcuts.
		*/
		if (getKeyguardManager().inKeyguardRestrictedInputMode()) {
		if (isNotInstantAppAndKeyguardRestricted()) {
		break;
		}
		if ((getContext().getResources().getConfiguration().uiMode
		@@ -2055,6 +2055,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		return false;
		}

		private boolean isNotInstantAppAndKeyguardRestricted() {
		return !getContext().getPackageManager().isInstantApp()
		&& getKeyguardManager().inKeyguardRestrictedInputMode();
		}

		@Override
		protected void onActive() {
		}