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

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

Browse Source 
* commit '6a06f12c3fa6a84306dc17f60eb16cdc25bc34b5':
  Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams
This commit is contained in:
Alan Viverette
2015-10-07 16:34:35 +00:00
committed by Android Git Automerger
parent 4524278bcb 6a06f12c3f
commit 8a0c8e78a7
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() {