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

Commit b9a474c2 authored by Chet Haase's avatar Chet Haase Committed by Android Git Automerger
Browse files

am f1c3f28e: Merge "Fix NPE when setting new LayoutTransition" into klp-dev 

* commit 'f1c3f28e':
  Fix NPE when setting new LayoutTransition
parents 71de1312 f1c3f28e

core/java/android/view/ViewGroup.java

+3 −2
Original line number Diff line number Diff line
@@ -3865,8 +3865,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
     */

    public void setLayoutTransition(LayoutTransition transition) {

        if (mTransition != null) {

            mTransition.cancel();

            mTransition.removeTransitionListener(mLayoutTransitionListener);

            LayoutTransition previousTransition = mTransition;

            previousTransition.cancel();

            previousTransition.removeTransitionListener(mLayoutTransitionListener);

        }

        mTransition = transition;

        if (mTransition != null) {