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

Merge "Fix NPE in RNA#callOnFinished"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-03 22:06:55 +00:00
committed by Android (Google) Code Review
parent 117d17b96f 6bb881fb45
commit 7e3051ca4e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/view/RenderNodeAnimator.java
View File

@@ -26,6 +26,7 @@ import android.graphics.RecordingCanvas;
import android.graphics.RenderNode;
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
import android.util.SparseIntArray;
import com.android.internal.util.VirtualRefBasePtr;
@@ -191,6 +192,9 @@ public class RenderNodeAnimator extends Animator {
}
mState = STATE_DELAYED;
if (mHandler == null) {
mHandler = new Handler(true);
}
applyInterpolator();
if (mNativePtr == null) {
@@ -224,9 +228,6 @@ public class RenderNodeAnimator extends Animator {
private void moveToRunningState() {
mState = STATE_RUNNING;
if (mNativePtr != null) {
if (mHandler == null) {
mHandler = new Handler();
}
nStart(mNativePtr.get());
}
notifyStartListeners();
@@ -503,7 +504,11 @@ public class RenderNodeAnimator extends Animator {
// Called by native
@UnsupportedAppUsage
private static void callOnFinished(RenderNodeAnimator animator) {
animator.mHandler.post(animator::onFinished);
if (animator.mHandler != null) {
animator.mHandler.post(animator::onFinished);
} else {
new Handler(Looper.getMainLooper(), null, true).post(animator::onFinished);
}
}
@Override