diff options
| author | Puneet Kumar <puneetster@google.com> | 2015-10-24 15:20:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-24 15:20:28 +0000 |
| commit | ca9c43b27b9e3bc007e731fe3a214cbed3edf8f3 (patch) | |
| tree | 34770dcdfc49f815054de2599cfa0d65a68334cf /services | |
| parent | 493272c8a7e7219f947a222cd71aaaf3d4bc3c0a (diff) | |
| parent | d847ad55554986d4312e100a8993994ed33edbfa (diff) | |
| download | frameworks_base-ca9c43b27b9e3bc007e731fe3a214cbed3edf8f3.zip frameworks_base-ca9c43b27b9e3bc007e731fe3a214cbed3edf8f3.tar.gz frameworks_base-ca9c43b27b9e3bc007e731fe3a214cbed3edf8f3.tar.bz2 | |
Merge "Prevent recents from coming up when in SUW" into mnc-dr-dev
Diffstat (limited to 'services')
| -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 495346a..0d96ca6 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -2994,7 +2994,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; |