Merge "Don't access keyguard from instant apps." into pi-dev

2018-06-08 04:49:39 +00:00
parent eaf3590eda 3ea66c319c
commit e7bd4e7e8f
1 changed files with 6 additions and 1 deletions
--- a/core/java/com/android/internal/policy/PhoneWindow.java
+++ b/core/java/com/android/internal/policy/PhoneWindow.java
@@ -2032,7 +2032,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
@@ -2056,6 +2056,11 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
        return false;
    }

+    private boolean isNotInstantAppAndKeyguardRestricted() {
+        return !getContext().getPackageManager().isInstantApp()
+            && getKeyguardManager().inKeyguardRestrictedInputMode();
+    }
+
    @Override
    protected void onActive() {
    }