diff options
| author | 2015-11-17 18:33:38 +0000 | |
|---|---|---|
| committer | 2015-11-17 18:33:38 +0000 | |
| commit | 4aa1e48a71df78fed20ac4105a2bd97ff04addf7 (patch) | |
| tree | 04c1987630ea8f2d04dd044ee3bd366b031bd6ae | |
| parent | abea6dc466cbd01be261192f8dbc083b58661bad (diff) | |
| parent | 333db2e12238997a3c0984f7ad0dc2f852b58eb9 (diff) | |
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev
| -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 489bcdb7b2c3..7a84698b2009 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -2968,7 +2968,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; |