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

Commit 8a0c8e78 authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am 6a06f12c: Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams" 

* commit '6a06f12c':
  Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams
parents 4524278b 6a06f12c

core/java/android/widget/AdapterViewAnimator.java

+4 −5
Original line number Diff line number Diff line
@@ -401,12 +401,11 @@ public abstract class AdapterViewAnimator extends AdapterView<Adapter> 
     }



    LayoutParams createOrReuseLayoutParams(View v) {

        final ViewGroup.LayoutParams currentLp = v.getLayoutParams();

        if (currentLp instanceof ViewGroup.LayoutParams) {

            LayoutParams lp = (LayoutParams) currentLp;

            return lp;

        final LayoutParams currentLp = v.getLayoutParams();

        if (currentLp != null) {

            return currentLp;

        }

        return new ViewGroup.LayoutParams(0, 0);

        return new LayoutParams(0, 0);

    }



    void refreshChildren() {