Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b30ea7f6 authored by Dan Sandler's avatar Dan Sandler Committed by Android Git Automerger
Browse files

am 7b7ef437: Merge "Don\'t start the keyguard until boot is done." into lmp-dev 

* commit '7b7ef437e5b46d1173a7458ada6520778284c91a':
  Don't start the keyguard until boot is done.
parents 6f65a96c 22ef3ed3

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -5269,6 +5269,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    @Override

    @Override

    public void systemBooted() {

    public void systemBooted() {

        if (mKeyguardDelegate != null) {

        if (mKeyguardDelegate != null) {

            mKeyguardDelegate.bindService(mContext);

            mKeyguardDelegate.onBootCompleted();

            mKeyguardDelegate.onBootCompleted();

        }

        }

        synchronized (mLock) {

        synchronized (mLock) {

policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -102,9 +102,12 @@ public class KeyguardServiceDelegate { 
    };

    };





    public KeyguardServiceDelegate(Context context, LockPatternUtils lockPatternUtils) {

    public KeyguardServiceDelegate(Context context, LockPatternUtils lockPatternUtils) {

        mScrim = createScrim(context);

    }



    public void bindService(Context context) {

        Intent intent = new Intent();

        Intent intent = new Intent();

        intent.setClassName(KEYGUARD_PACKAGE, KEYGUARD_CLASS);

        intent.setClassName(KEYGUARD_PACKAGE, KEYGUARD_CLASS);

        mScrim = createScrim(context);

        if (!context.bindServiceAsUser(intent, mKeyguardConnection,

        if (!context.bindServiceAsUser(intent, mKeyguardConnection,

                Context.BIND_AUTO_CREATE, UserHandle.OWNER)) {

                Context.BIND_AUTO_CREATE, UserHandle.OWNER)) {

            if (DEBUG) Log.v(TAG, "*** Keyguard: can't bind to " + KEYGUARD_CLASS);

            if (DEBUG) Log.v(TAG, "*** Keyguard: can't bind to " + KEYGUARD_CLASS);
@@ -250,7 +253,6 @@ public class KeyguardServiceDelegate { 
        if (mKeyguardService != null) {

        if (mKeyguardService != null) {

            mKeyguardService.onSystemReady();

            mKeyguardService.onSystemReady();

        } else {

        } else {

            if (DEBUG) Log.v(TAG, "onSystemReady() called before keyguard service was ready");

            mKeyguardState.systemIsReady = true;

            mKeyguardState.systemIsReady = true;

        }

        }

    }

    }