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

Commit 1692aec6 authored by Rob Carr's avatar Rob Carr Committed by Automerger Merge Worker
Browse files

Merge changes I98b51b43,I03cb69e1 into rvc-dev am: f2f056ef am: 8ef534bb am: 788347a9 

Change-Id: I5a9baba40e9320cae3de8b4fb528ef81bd8427c3
parents 809f31c5 788347a9

core/java/android/view/InsetsAnimationThreadControlRunner.java

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class InsetsAnimationThreadControlRunner implements InsetsAnimationContro 
            @AnimationType int animationType, Handler mainThreadHandler) {

        mMainThreadHandler = mainThreadHandler;

        mOuterCallbacks = controller;

        mControl = new InsetsAnimationControlImpl(copyControls(controls), frame, state, listener,

        mControl = new InsetsAnimationControlImpl(controls, frame, state, listener,

                types, mCallbacks, durationMs, interpolator, animationType);

        InsetsAnimationThread.getHandler().post(() -> listener.onReady(mControl, types));

    }

core/java/android/view/InsetsSourceConsumer.java

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class InsetsSourceConsumer { 
            }

        }

        if (lastControl != null) {

            lastControl.release(mController::releaseSurfaceControlFromRt);

            lastControl.release(SurfaceControl::release);

        }

    }