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

am 651474d0: am 4d7a6248: Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev

Browse Source 
* commit '651474d0275f9d7cd10cdd6e0afb7dd107e66335':
  Fixed a Settings crash when entering SIM status
This commit is contained in:
PauloftheWest
2014-12-05 19:12:44 +00:00
committed by Android Git Automerger
parent 76fd9d62fa 651474d027
commit d831733fab
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) { if (mSelectableSubInfos.size() > 1) {
setContentView(R.layout.sim_information); setContentView(R.layout.sim_information);
@@ -363,6 +363,7 @@ public class SimStatus extends PreferenceActivity {
} }
private void updatePhoneInfos() { private void updatePhoneInfos() {
if (mSir != null) {
final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId( final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(
mSir.getSubscriptionId())); mSir.getSubscriptionId()));
if (UserHandle.myUserId() == UserHandle.USER_OWNER if (UserHandle.myUserId() == UserHandle.USER_OWNER
@@ -392,6 +393,7 @@ public class SimStatus extends PreferenceActivity {
}; };
} }
} }
}
private OnTabChangeListener mTabListener = new OnTabChangeListener() { private OnTabChangeListener mTabListener = new OnTabChangeListener() {
@Override @Override
public void onTabChanged(String tabId) { public void onTabChanged(String tabId) {