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

Commit 4166305f authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Automerger Merge Worker
Browse files

Merge "Use correct activeModemCount upon onMultiSimConfigChanged." into rvc-dev am: 30434079 

Change-Id: I92afc81bc4cc5f9619454ccebeb6c7cedcebd554
parents 5304dab2 30434079

src/java/com/android/internal/telephony/uicc/UiccController.java

+4 −3
Original line number Diff line number Diff line
@@ -530,7 +530,9 @@ public class UiccController extends Handler { 
                    break;

                case EVENT_MULTI_SIM_CONFIG_CHANGED:

                    if (DBG) log("Received EVENT_MULTI_SIM_CONFIG_CHANGED");

                    onMultiSimConfigChanged();

                    int activeModemCount = (int) ((AsyncResult) msg.obj).result;

                    onMultiSimConfigChanged(activeModemCount);

                    break;

                default:

                    Rlog.e(LOG_TAG, " Unknown Event " + msg.what);

                    break;
@@ -538,10 +540,9 @@ public class UiccController extends Handler { 
        }

    }



    private void onMultiSimConfigChanged() {

    private void onMultiSimConfigChanged(int newActiveModemCount) {

        int prevActiveModemCount = mCis.length;

        mCis = PhoneFactory.getCommandsInterfaces();

        int newActiveModemCount = mCis.length;



        logWithLocalLog("onMultiSimConfigChanged: prevActiveModemCount " + prevActiveModemCount

                + ", newActiveModemCount " + newActiveModemCount);