Fix SimStatus crash in Settings.
Bug: 20862873 Change-Id: I1ae60ceb64a8af8b3f875e50dd62dfe9796192ca
This commit is contained in:
@@ -143,24 +143,28 @@ public class SimStatus extends InstrumentedPreferenceActivity {
|
|||||||
// Note - missing in zaku build, be careful later...
|
// Note - missing in zaku build, be careful later...
|
||||||
mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH);
|
mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH);
|
||||||
|
|
||||||
mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
|
if (mSelectableSubInfos == null) {
|
||||||
if (mSelectableSubInfos.size() > 1) {
|
mSir = null;
|
||||||
setContentView(R.layout.sim_information);
|
} else {
|
||||||
|
mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
|
||||||
|
|
||||||
mTabHost = (TabHost) findViewById(android.R.id.tabhost);
|
if (mSelectableSubInfos.size() > 1) {
|
||||||
mTabWidget = (TabWidget) findViewById(android.R.id.tabs);
|
setContentView(R.layout.sim_information);
|
||||||
mListView = (ListView) findViewById(android.R.id.list);
|
|
||||||
|
|
||||||
mTabHost.setup();
|
mTabHost = (TabHost) findViewById(android.R.id.tabhost);
|
||||||
mTabHost.setOnTabChangedListener(mTabListener);
|
mTabWidget = (TabWidget) findViewById(android.R.id.tabs);
|
||||||
mTabHost.clearAllTabs();
|
mListView = (ListView) findViewById(android.R.id.list);
|
||||||
|
|
||||||
for (int i = 0; i < mSelectableSubInfos.size(); i++) {
|
mTabHost.setup();
|
||||||
mTabHost.addTab(buildTabSpec(String.valueOf(i),
|
mTabHost.setOnTabChangedListener(mTabListener);
|
||||||
String.valueOf(mSelectableSubInfos.get(i).getDisplayName())));
|
mTabHost.clearAllTabs();
|
||||||
|
|
||||||
|
for (int i = 0; i < mSelectableSubInfos.size(); i++) {
|
||||||
|
mTabHost.addTab(buildTabSpec(String.valueOf(i),
|
||||||
|
String.valueOf(mSelectableSubInfos.get(i).getDisplayName())));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
updatePhoneInfos();
|
updatePhoneInfos();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user