commit 6a06f12c3fa6a84306dc17f60eb16cdc25bc34b5
author Alan Viverette <alanv@google.com> Wed Oct 07 16:23:36 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 07 16:23:36 2015 +0000
tree 572966bd326a73d1e5b0c3dd9e204ddcbb8fe3fa
parent 7de6ae159e0652cabe57ea8814ce8633049644a2
parent 3f9ef97ad96262c5c43eb6199b5484161a3acc2c

Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams"

core/java/android/widget/AdapterViewAnimator.java

diff --git a/core/java/android/widget/AdapterViewAnimator.java b/core/java/android/widget/AdapterViewAnimator.java
index 932b354..0e3a69f 100644
--- a/core/java/android/widget/AdapterViewAnimator.java
+++ b/core/java/android/widget/AdapterViewAnimator.java
@@ -401,12 +401,11 @@
      }
 
     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() {