Don't access keyguard from instant apps. (54f78810) · Commits · e / os / android_frameworks_base

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

+10 −5

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler {
		}

		case KeyEvent.KEYCODE_CALL: {
		if (getKeyguardManager().inKeyguardRestrictedInputMode() \|\| dispatcher == null) {
		if (isNotInstantAppAndKeyguardRestricted(dispatcher)) {
		break;
		}
		if (event.getRepeatCount() == 0) {
		@@ -139,7 +139,7 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler {
		}

		case KeyEvent.KEYCODE_CAMERA: {
		if (getKeyguardManager().inKeyguardRestrictedInputMode() \|\| dispatcher == null) {
		if (isNotInstantAppAndKeyguardRestricted(dispatcher)) {
		break;
		}
		if (event.getRepeatCount() == 0) {
		@@ -164,7 +164,7 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler {
		}

		case KeyEvent.KEYCODE_SEARCH: {
		if (getKeyguardManager().inKeyguardRestrictedInputMode() \|\| dispatcher == null) {
		if (isNotInstantAppAndKeyguardRestricted(dispatcher)) {
		break;
		}
		if (event.getRepeatCount() == 0) {
		@@ -202,6 +202,11 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler {
		return false;
		}

		private boolean isNotInstantAppAndKeyguardRestricted(KeyEvent.DispatcherState dispatcher) {
		return !mContext.getPackageManager().isInstantApp()
		&& (getKeyguardManager().inKeyguardRestrictedInputMode() \|\| dispatcher == null);
		}

		boolean onKeyUp(int keyCode, KeyEvent event) {
		if (DEBUG) {
		Log.d(TAG, "up " + keyCode);
		@@ -238,7 +243,7 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler {
		}

		case KeyEvent.KEYCODE_CAMERA: {
		if (getKeyguardManager().inKeyguardRestrictedInputMode()) {
		if (isNotInstantAppAndKeyguardRestricted(dispatcher)) {
		break;
		}
		if (event.isTracking() && !event.isCanceled()) {
		@@ -248,7 +253,7 @@ public class PhoneFallbackEventHandler implements FallbackEventHandler {
		}

		case KeyEvent.KEYCODE_CALL: {
		if (getKeyguardManager().inKeyguardRestrictedInputMode()) {
		if (isNotInstantAppAndKeyguardRestricted(dispatcher)) {
		break;
		}
		if (event.isTracking() && !event.isCanceled()) {