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

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

Browse Source 
* commit 'd831733fabc672842e5519d724c05c8b835824b6':
  Fixed a Settings crash when entering SIM status
This commit is contained in:
PauloftheWest
2014-12-05 19:21:45 +00:00
committed by Android Git Automerger
parent 9a73365ed7 d831733fab
commit a754c6ba05
1 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
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,33 +363,35 @@ public class SimStatus extends PreferenceActivity {
} }
private void updatePhoneInfos() { private void updatePhoneInfos() {
final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId( if (mSir != null) {
final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(
mSir.getSubscriptionId())); mSir.getSubscriptionId()));
if (UserHandle.myUserId() == UserHandle.USER_OWNER if (UserHandle.myUserId() == UserHandle.USER_OWNER
&& mSir.getSubscriptionId() != SubscriptionManager.INVALID_SUBSCRIPTION_ID) { && mSir.getSubscriptionId() != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
if (phone == null) { if (phone == null) {
Log.e(TAG, "Unable to locate a phone object for the given Subscription ID."); Log.e(TAG, "Unable to locate a phone object for the given Subscription ID.");
return; return;
}
mPhone = phone;
mPhoneStateListener = new PhoneStateListener(mSir.getSubscriptionId()) {
@Override
public void onDataConnectionStateChanged(int state) {
updateDataState();
updateNetworkType();
}
@Override
public void onSignalStrengthsChanged(SignalStrength signalStrength) {
updateSignalStrength(signalStrength);
}
@Override
public void onServiceStateChanged(ServiceState serviceState) {
updateServiceState(serviceState);
}
};
} }
mPhone = phone;
mPhoneStateListener = new PhoneStateListener(mSir.getSubscriptionId()) {
@Override
public void onDataConnectionStateChanged(int state) {
updateDataState();
updateNetworkType();
}
@Override
public void onSignalStrengthsChanged(SignalStrength signalStrength) {
updateSignalStrength(signalStrength);
}
@Override
public void onServiceStateChanged(ServiceState serviceState) {
updateServiceState(serviceState);
}
};
} }
} }
private OnTabChangeListener mTabListener = new OnTabChangeListener() { private OnTabChangeListener mTabListener = new OnTabChangeListener() {