diff options
| author | Danesh M <danesh@cyngn.com> | 2016-06-28 16:36:38 -0700 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2016-06-29 11:19:19 -0700 |
| commit | d4c6db9ce9020148d41234d5f28f0d57cc98f41c (patch) | |
| tree | 8fd08ae315f28ce8bc4bedf393a8b40906df482d /services/core | |
| parent | 51d2d193f88c4353783ed387726e718547a7f5ce (diff) | |
| download | frameworks_base-d4c6db9ce9020148d41234d5f28f0d57cc98f41c.zip frameworks_base-d4c6db9ce9020148d41234d5f28f0d57cc98f41c.tar.gz frameworks_base-d4c6db9ce9020148d41234d5f28f0d57cc98f41c.tar.bz2 | |
PhoneWindowManager : Check CM_SETUP_WIZARD_COMPLETED for isUserSetupComplete
During certain flows (such as restoring device data), google's setup wizard
sets USER_SETUP_COMPLETED which forces certain things like immersive clings to show
when they are not suppose to. Add additional checks to ensure these clings only appear
after setup wizard has completed
CYNGNOS-3077
Change-Id: I111b3a06e1531bb4265d55bc8a8dcdb02f80cc0b
Diffstat (limited to 'services/core')
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index a04a3ed..4d93c78 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -1440,8 +1440,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { } boolean isUserSetupComplete() { - return Settings.Secure.getIntForUser(mContext.getContentResolver(), - Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0; + return CMSettings.Secure.getIntForUser(mContext.getContentResolver(), + CMSettings.Secure.CM_SETUP_WIZARD_COMPLETED, 0, UserHandle.USER_CURRENT) != 0; } private void handleShortPressOnHome() { |