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

Commit 2845c972 authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

am 2e4bb6e9: am bc0a997a: am 0df576ee: Merge "Fix crash from USER_PRESENT... 

am 2e4bb6e9: am bc0a997a: am 0df576ee: Merge "Fix crash from USER_PRESENT broadcast in sysui" into lmp-dev

* commit '2e4bb6e99f3e5d247e4b189b573acea66d5a854f':
  Fix crash from USER_PRESENT broadcast in sysui
parents 9b969c4f 42fd0039

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+16 −2
Original line number Diff line number Diff line
@@ -170,6 +170,8 @@ public class KeyguardViewMediator extends SystemUI { 
    private boolean mSwitchingUser;



    private boolean mSystemReady;

    private boolean mBootCompleted;

    private boolean mBootSendUserPresent;



    // Whether the next call to playSounds() should be skipped.  Defaults to

    // true because the first lock (on boot) should be silent.
@@ -1145,8 +1147,14 @@ public class KeyguardViewMediator extends SystemUI { 
    }



    private void sendUserPresentBroadcast() {

        synchronized (this) {

            if (mBootCompleted) {

                final UserHandle currentUser = new UserHandle(mLockPatternUtils.getCurrentUser());

                mContext.sendBroadcastAsUser(USER_PRESENT_INTENT, currentUser);

            } else {

                mBootSendUserPresent = true;

            }

        }

    }



    /**
@@ -1406,6 +1414,12 @@ public class KeyguardViewMediator extends SystemUI { 


    public void onBootCompleted() {

        mUpdateMonitor.dispatchBootCompleted();

        synchronized (this) {

            mBootCompleted = true;

            if (mBootSendUserPresent) {

                sendUserPresentBroadcast();

            }

        }

    }



    public StatusBarKeyguardViewManager registerStatusBar(PhoneStatusBar phoneStatusBar,