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

Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams"

Browse Source
This commit is contained in:
Alan Viverette
2015-10-07 16:23:36 +00:00
committed by Gerrit Code Review
parent 7de6ae159e 3f9ef97ad9
commit 6a06f12c3f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/widget/AdapterViewAnimator.java
View File

@@ -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() {