PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev

Browse Source
This commit is contained in:
PauloftheWest
2014-12-04 18:25:33 +00:00
committed by Android (Google) Code Review
parent 91a4deb5e9 7fa2415492
commit 4d7a624858
1 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/deviceinfo/SimStatus.java
View File

@@ -153,7 +153,7 @@ public class SimStatus extends PreferenceActivity {
}
}
mSir = mSelectableSubInfos.get(0);
mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
if (mSelectableSubInfos.size() > 1) {
setContentView(R.layout.sim_information);
@@ -363,6 +363,7 @@ public class SimStatus extends PreferenceActivity {
}
private void updatePhoneInfos() {
if (mSir != null) {
final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(
mSir.getSubscriptionId()));
if (UserHandle.myUserId() == UserHandle.USER_OWNER
@@ -392,6 +393,7 @@ public class SimStatus extends PreferenceActivity {
};
}
}
}
private OnTabChangeListener mTabListener = new OnTabChangeListener() {
@Override
public void onTabChanged(String tabId) {