Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I98b51b43,I03cb69e1 into rvc-dev am: f2f056ef71 am: a77f60313d

Browse Source 
Change-Id: I0fa94608b8cf1697571abec966cff6dd67c153e6
This commit is contained in:
Rob Carr
2020-04-01 23:08:23 +00:00
committed by Automerger Merge Worker
parent a6fa705ba0 a77f60313d
commit 698a536015
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/InsetsAnimationThreadControlRunner.java
View File

@@ -91,7 +91,7 @@ public class InsetsAnimationThreadControlRunner implements InsetsAnimationContro
@AnimationType int animationType, Handler mainThreadHandler) { @AnimationType int animationType, Handler mainThreadHandler) {
mMainThreadHandler = mainThreadHandler; mMainThreadHandler = mainThreadHandler;
mOuterCallbacks = controller; mOuterCallbacks = controller;
mControl = new InsetsAnimationControlImpl(copyControls(controls), frame, state, listener, mControl = new InsetsAnimationControlImpl(controls, frame, state, listener,
types, mCallbacks, durationMs, interpolator, animationType); types, mCallbacks, durationMs, interpolator, animationType);
InsetsAnimationThread.getHandler().post(() -> listener.onReady(mControl, types)); InsetsAnimationThread.getHandler().post(() -> listener.onReady(mControl, types));
} }

2
core/java/android/view/InsetsSourceConsumer.java
View File

@@ -117,7 +117,7 @@ public class InsetsSourceConsumer {
} }
} }
if (lastControl != null) { if (lastControl != null) {
lastControl.release(mController::releaseSurfaceControlFromRt); lastControl.release(SurfaceControl::release);
} }
} }