diff options
| author | Dan Sandler <dsandler@android.com> | 2014-09-26 19:32:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-26 19:32:26 +0000 |
| commit | 22ef3ed3055ff668089853bd6e1e685a2e4cef45 (patch) | |
| tree | 8b06fac85385f483510037f2376e7b6a56f6854f /policy | |
| parent | a0f63c6e9522b891898c665be58415d34a1dd6c1 (diff) | |
| parent | 5eeebf5c29c49be5fc29558c6b16ffe5df87b690 (diff) | |
| download | frameworks_base-22ef3ed3055ff668089853bd6e1e685a2e4cef45.zip frameworks_base-22ef3ed3055ff668089853bd6e1e685a2e4cef45.tar.gz frameworks_base-22ef3ed3055ff668089853bd6e1e685a2e4cef45.tar.bz2 | |
Merge "Don't start the keyguard until boot is done." into lmp-dev
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 1 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 73ff066..6ea4497 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -5269,6 +5269,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { @Override public void systemBooted() { if (mKeyguardDelegate != null) { + mKeyguardDelegate.bindService(mContext); mKeyguardDelegate.onBootCompleted(); } synchronized (mLock) { diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java index e9ca5c9..50fe7c7 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java @@ -102,9 +102,12 @@ public class KeyguardServiceDelegate { }; public KeyguardServiceDelegate(Context context, LockPatternUtils lockPatternUtils) { + mScrim = createScrim(context); + } + + public void bindService(Context context) { Intent intent = new Intent(); intent.setClassName(KEYGUARD_PACKAGE, KEYGUARD_CLASS); - mScrim = createScrim(context); if (!context.bindServiceAsUser(intent, mKeyguardConnection, Context.BIND_AUTO_CREATE, UserHandle.OWNER)) { if (DEBUG) Log.v(TAG, "*** Keyguard: can't bind to " + KEYGUARD_CLASS); @@ -250,7 +253,6 @@ public class KeyguardServiceDelegate { if (mKeyguardService != null) { mKeyguardService.onSystemReady(); } else { - if (DEBUG) Log.v(TAG, "onSystemReady() called before keyguard service was ready"); mKeyguardState.systemIsReady = true; } } |