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

Commit e9097af7 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix race condition when destroying view" into oc-dr1-dev am:... 

Merge "Merge "Fix race condition when destroying view" into oc-dr1-dev am: b0e5b53b am: aa65f36f am: a7d7e6fb"
parents 27a4009d 20977928

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java

+5 −2
Original line number Diff line number Diff line
@@ -234,8 +234,11 @@ public class KeyguardBouncer { 
    }



    protected void ensureView() {

        mHandler.removeCallbacks(mRemoveViewRunnable);

        if (mRoot == null) {

        // Removal of the view might be deferred to reduce unlock latency,

        // in this case we need to force the removal, otherwise we'll

        // end up in an unpredictable state.

        boolean forceRemoval = mHandler.hasCallbacks(mRemoveViewRunnable);

        if (mRoot == null || forceRemoval) {

            inflateView();

        }

    }

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+1 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 


    public void onOverlayChanged() {

        mBouncer.hide(true /* destroyView */);

        mBouncer.prepare();

    }



    private void animateScrimControllerKeyguardFadingOut(long delay, long duration,