diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:50:52 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-07 18:50:52 -0800 |
| commit | 10c07f778a611d8723619f67e5709cbd9e502a07 (patch) | |
| tree | 2747712ffb2d61348ec7b241d0c2a764397a07a5 /services/core/java/com/android/server/policy/PhoneWindowManager.java | |
| parent | 45c11b1020a64aae88b859870d5b2e312dab4f76 (diff) | |
| parent | 4d70bd7a928903b35c92619437c70bc382587b71 (diff) | |
| download | frameworks_base-10c07f778a611d8723619f67e5709cbd9e502a07.zip frameworks_base-10c07f778a611d8723619f67e5709cbd9e502a07.tar.gz frameworks_base-10c07f778a611d8723619f67e5709cbd9e502a07.tar.bz2 | |
Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/frameworks/base into cm-13.0
Android 6.0.1 release 3
Change-Id: I59b9e5a943e0860d43bcfb36ee0e8b8b072412ea
Diffstat (limited to 'services/core/java/com/android/server/policy/PhoneWindowManager.java')
| -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 c8d329c..dd4d3ab 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -3567,7 +3567,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; |