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

Commit a7d7e6fb authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

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

am: aa65f36f

Change-Id: I197d45d0a274a68a17a3c8d83880d0a75a3b5456
parents fe7ff804 aa65f36f

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,