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

Merge "Fixed NullPointerException" am: 5fb16be925

Browse Source 
Change-Id: Ie99fc2139875e0f8dfbfbe0bd31f55f135607996
This commit is contained in:
Treehugger Robot
2020-03-23 06:00:05 +00:00
committed by Automerger Merge Worker
parent c6e000ff18 5fb16be925
commit cbe5bbdcd5
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/com/android/settings/IccLockSettings.java
View File

@@ -31,6 +31,7 @@ import android.os.Message;
import android.os.PersistableBundle; import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager; import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@@ -230,13 +231,16 @@ public class IccLockSettings extends SettingsPreferenceFragment
for (int i = 0; i < numSims; ++i) { for (int i = 0; i < numSims; ++i) {
final SubscriptionInfo subInfo = final SubscriptionInfo subInfo =
getActiveSubscriptionInfoForSimSlotIndex(subInfoList, i); getActiveSubscriptionInfoForSimSlotIndex(subInfoList, i);
final CarrierConfigManager carrierConfigManager = getContext().getSystemService( if (subInfo != null) {
CarrierConfigManager.class); final CarrierConfigManager carrierConfigManager = getContext().getSystemService(
final PersistableBundle bundle = carrierConfigManager.getConfigForSubId( CarrierConfigManager.class);
subInfo.getSubscriptionId()); final PersistableBundle bundle = carrierConfigManager.getConfigForSubId(
if (bundle != null subInfo.getSubscriptionId());
&& !bundle.getBoolean(CarrierConfigManager.KEY_HIDE_SIM_LOCK_SETTINGS_BOOL)) { if (bundle != null
componenterList.add(subInfo); && !bundle.getBoolean(CarrierConfigManager
.KEY_HIDE_SIM_LOCK_SETTINGS_BOOL)) {
componenterList.add(subInfo);
}
} }
} }
@@ -291,7 +295,8 @@ public class IccLockSettings extends SettingsPreferenceFragment
final List<SubscriptionInfo> subInfoList = final List<SubscriptionInfo> subInfoList =
mProxySubscriptionMgr.getActiveSubscriptionsInfo(); mProxySubscriptionMgr.getActiveSubscriptionsInfo();
final SubscriptionInfo sir = getActiveSubscriptionInfoForSimSlotIndex(subInfoList, mSlotId); final SubscriptionInfo sir = getActiveSubscriptionInfoForSimSlotIndex(subInfoList, mSlotId);
mSubId = sir.getSubscriptionId(); mSubId = (sir == null) ? SubscriptionManager.INVALID_SUBSCRIPTION_ID
: sir.getSubscriptionId();
if (mPinDialog != null) { if (mPinDialog != null) {
mPinDialog.setEnabled(sir != null); mPinDialog.setEnabled(sir != null);
@@ -677,8 +682,6 @@ public class IccLockSettings extends SettingsPreferenceFragment
@Override @Override
public void onTabChanged(String tabId) { public void onTabChanged(String tabId) {
mSlotId = Integer.parseInt(tabId); mSlotId = Integer.parseInt(tabId);
final SubscriptionInfo sir = getActiveSubscriptionInfoForSimSlotIndex(
mProxySubscriptionMgr.getActiveSubscriptionsInfo(), mSlotId);
// The User has changed tab; update the body. // The User has changed tab; update the body.
updatePreferences(); updatePreferences();