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

Commit 7860f2c3 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Change to query ICC file handler directly from IccCard instead of from... 

Merge "Change to query ICC file handler directly from IccCard instead of from Phone obj." into lmp-mr1-dev
parents 916a4a24 2d2fa9e5

src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java

+11 −1
Original line number Diff line number Diff line
@@ -320,8 +320,18 @@ public class SubscriptionInfoUpdater extends Handler { 
        logd("queryIccId: slotid=" + slotId);

        if (mFh[slotId] == null) {

            logd("Getting IccFileHandler");

            if (mPhone[slotId].getIccCard() != null) {

                mFh[slotId] = mPhone[slotId].getIccCard().getIccFileHandler();

            }

            /** Just in case file handler cannot be obtained from IccCard directly, we can use the

             * earlier way of getting it from phone */

            // TODO remove this if block

             if (mFh[slotId] == null) {

                logd("queryIccId: Could not get IccFileHandler directly from IccCard");

                mFh[slotId] = ((PhoneProxy) mPhone[slotId]).getIccFileHandler();

            }

        }



        if (mFh[slotId] != null) {

            String iccId = mIccId[slotId];

            if (iccId == null) {