diff options
| author | 2018-06-07 20:20:34 -0700 | |
|---|---|---|
| committer | 2018-06-07 20:20:38 -0700 | |
| commit | 3ea66c319cbb82a13645a09a9afa03b9f997c192 (patch) | |
| tree | 90f55cfaeb05a6651dd52bc4e403d0fb43cdd8ab | |
| parent | 10422896ed9d61d518b43438c619f1c94ea76d89 (diff) | |
Don't access keyguard from instant apps.
Test: cts-instant-tradefed run cts-instant -m CtsViewTestCases
bug:109652548
Change-Id: I6f8bb714bd98fd53068b2662633a9155d64b274c
| -rw-r--r-- | core/java/com/android/internal/policy/PhoneWindow.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/com/android/internal/policy/PhoneWindow.java b/core/java/com/android/internal/policy/PhoneWindow.java index 3fe8f85aeaa9..daea9a8eff41 100644 --- 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() { } |