Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24565c1b authored by Sanghee Kim's avatar Sanghee Kim
Browse files

Fixed NullPointerException 



1. only one sim insertion.
2. sim removal in sim card lock setting menu.

Additionally, removed unnecessary code.

Test: manual

Change-Id: I5710b9c313d6e0b7c011a12e0179a4d5a4f7e580
Signed-off-by: default avatarSanghee Kim <haya93@samsung.com>
parent c305df94

src/com/android/settings/IccLockSettings.java

+13 −10
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.Message; 
import android.os.PersistableBundle;

import android.telephony.CarrierConfigManager;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.Log;
@@ -230,15 +231,18 @@ public class IccLockSettings extends SettingsPreferenceFragment 
        for (int i = 0; i < numSims; ++i) {

            final SubscriptionInfo subInfo =

                    getActiveSubscriptionInfoForSimSlotIndex(subInfoList, i);

            if (subInfo != null) {

                final CarrierConfigManager carrierConfigManager = getContext().getSystemService(

                        CarrierConfigManager.class);

                final PersistableBundle bundle = carrierConfigManager.getConfigForSubId(

                        subInfo.getSubscriptionId());

                if (bundle != null

                    && !bundle.getBoolean(CarrierConfigManager.KEY_HIDE_SIM_LOCK_SETTINGS_BOOL)) {

                        && !bundle.getBoolean(CarrierConfigManager

                        .KEY_HIDE_SIM_LOCK_SETTINGS_BOOL)) {

                    componenterList.add(subInfo);

                }

            }

        }



        if (componenterList.size() == 0) {

            Log.e(TAG, "onCreateView: no sim info");
@@ -291,7 +295,8 @@ public class IccLockSettings extends SettingsPreferenceFragment 
        final List<SubscriptionInfo> subInfoList =

                mProxySubscriptionMgr.getActiveSubscriptionsInfo();

        final SubscriptionInfo sir = getActiveSubscriptionInfoForSimSlotIndex(subInfoList, mSlotId);

        mSubId = sir.getSubscriptionId();

        mSubId = (sir == null) ? SubscriptionManager.INVALID_SUBSCRIPTION_ID

            : sir.getSubscriptionId();



        if (mPinDialog != null) {

            mPinDialog.setEnabled(sir != null);
@@ -677,8 +682,6 @@ public class IccLockSettings extends SettingsPreferenceFragment 
        @Override

        public void onTabChanged(String tabId) {

            mSlotId = Integer.parseInt(tabId);

            final SubscriptionInfo sir = getActiveSubscriptionInfoForSimSlotIndex(

                    mProxySubscriptionMgr.getActiveSubscriptionsInfo(), mSlotId);



            // The User has changed tab; update the body.

            updatePreferences();