diff options
| author | Michael Wright <michaelwr@google.com> | 2015-11-13 21:52:18 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-12-10 16:41:08 -0800 |
| commit | ef53d61260e3b2e4925dd3aaa3d7ab6cfb1fc856 (patch) | |
| tree | 992d4af2581ba5edd05ac4bdfe4f8b8fc2e59912 | |
| parent | a1734f02c965a989092bbadce43920d0e729d0d4 (diff) | |
| download | base-ef53d61260e3b2e4925dd3aaa3d7ab6cfb1fc856.tar.gz | |
DO NOT MERGE. Prevent recents from coming up when in SUW
Bug: 25229538
Change-Id: If4f276d3f7c04fd89011068d90a3c3c60593bc05
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 2 |
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 5adf3a5dc186..b7a301db811b 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; |