diff options
| author | 2015-10-24 15:42:33 +0000 | |
|---|---|---|
| committer | 2015-10-24 15:42:33 +0000 | |
| commit | fc12c7c1b7ecd71517feb70ec4fe027545fda4c2 (patch) | |
| tree | aa9bed9c0183a8984d7c1555c9bf91aa08cf43ab | |
| parent | 06eb98c04d82cd7f6094aca738fc449d4f8af3fd (diff) | |
| parent | ca9c43b27b9e3bc007e731fe3a214cbed3edf8f3 (diff) | |
Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev
am: ca9c43b27b
* commit 'ca9c43b27b9e3bc007e731fe3a214cbed3edf8f3':
Prevent recents from coming up when in SUW
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 8ad45c935ea1..ace250507361 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -2995,7 +2995,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; |