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

Fix bug 2747634 - Crash on selecting wifi

Browse Source 
Allow Spinner to call setAdapter during superclass construction.

Change-Id: Ia57d231249b28de3809d7ee09a77277eac1553ca
This commit is contained in:
Adam Powell
2010-06-07 12:48:07 -07:00
parent b4912f9b2d
commit 68464a9599
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/widget/Spinner.java
View File

@@ -51,6 +51,7 @@ public class Spinner extends AbsSpinner implements OnClickListener {
public static final int MODE_DROPDOWN = 1;
private SpinnerPopup mPopup;
private DropDownAdapter mTempAdapter;
public Spinner(Context context) {
this(context, null);
@@ -96,12 +97,24 @@ public class Spinner extends AbsSpinner implements OnClickListener {
mPopup.setPromptText(a.getString(com.android.internal.R.styleable.Spinner_prompt));
a.recycle();
// Base constructor can call setAdapter before we initialize mPopup.
// Finish setting things up if this happened.
if (mTempAdapter != null) {
mPopup.setAdapter(mTempAdapter);
mTempAdapter = null;
}
}
@Override
public void setAdapter(SpinnerAdapter adapter) {
super.setAdapter(adapter);
mPopup.setAdapter(new DropDownAdapter(adapter));
if (mPopup != null) {
mPopup.setAdapter(new DropDownAdapter(adapter));
} else {
mTempAdapter = new DropDownAdapter(adapter);
}
}
@Override