Merge "Don't start the keyguard until boot is done." into lmp-dev (22ef3ed3) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -5269,6 +5269,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		@Override
		public void systemBooted() {
		if (mKeyguardDelegate != null) {
		mKeyguardDelegate.bindService(mContext);
		mKeyguardDelegate.onBootCompleted();
		}
		synchronized (mLock) {

+4 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}