summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Michael Wright <michaelwr@google.com> 2015-11-17 19:52:13 +0000
committer android-build-merger <android-build-merger@google.com> 2015-11-17 19:52:13 +0000
commit614ea464051835e1c2267ef2bc343f98b62b177a (patch)
treef0340be881b54b3748a02915f531fa16157533fe
parentb133b984a0644a78270d51007123e75ded24eb14 (diff)
parent84669ca8de55d38073a0dcb01074233b0a417541 (diff)
DO NOT MERGE. Prevent recents from coming up when in SUW
am: 84669ca8de * commit '84669ca8de55d38073a0dcb01074233b0a417541': DO NOT MERGE. Prevent recents from coming up when in SUW
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index c8cfab8ae997..1c9811d09e2a 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -2720,7 +2720,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
// Display task switcher for ALT-TAB.
if (down && repeatCount == 0 && keyCode == KeyEvent.KEYCODE_TAB) {
- if (mRecentAppsHeldModifiers == 0 && !keyguardOn) {
+ if (mRecentAppsHeldModifiers == 0 && !keyguardOn && isUserSetupComplete()) {
final int shiftlessModifiers = event.getModifiers() & ~KeyEvent.META_SHIFT_MASK;
if (KeyEvent.metaStateHasModifiers(shiftlessModifiers, KeyEvent.META_ALT_ON)) {
mRecentAppsHeldModifiers = shiftlessModifiers;