fix merge [DO NOT MERGE]
ag/7020248 defined mSelectPhoneIndexHandler twice, this fix removes the double definition Change-Id: I749ab26dc71f269fd322d51b94a4809cecfd0df1
This commit is contained in:
@@ -1599,32 +1599,6 @@ public class RadioInfo extends Activity {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
AdapterView.OnItemSelectedListener mSelectPhoneIndexHandler =
|
|
||||||
new AdapterView.OnItemSelectedListener() {
|
|
||||||
|
|
||||||
public void onItemSelected(AdapterView parent, View v, int pos, long id) {
|
|
||||||
if (pos >= 0 && pos <= mPhoneIndexLabels.length - 1) {
|
|
||||||
// the array position is equal to the phone index
|
|
||||||
int phoneIndex = pos;
|
|
||||||
Phone[] phones = PhoneFactory.getPhones();
|
|
||||||
if (phones == null || phones.length <= phoneIndex) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// getSubId says it takes a slotIndex, but it actually takes a phone index
|
|
||||||
int[] subIds = SubscriptionManager.getSubId(phoneIndex);
|
|
||||||
if (subIds == null || subIds.length < 1) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
mSelectedPhoneIndex = phoneIndex;
|
|
||||||
|
|
||||||
updatePhoneIndex(phoneIndex, subIds[0]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onNothingSelected(AdapterView parent) {
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
AdapterView.OnItemSelectedListener mSelectPhoneIndexHandler =
|
AdapterView.OnItemSelectedListener mSelectPhoneIndexHandler =
|
||||||
new AdapterView.OnItemSelectedListener() {
|
new AdapterView.OnItemSelectedListener() {
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user