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

Commit 66295985 authored by Malcolm Chen's avatar Malcolm Chen Committed by Xiangyu/Malcolm Chen
Browse files

Move getPhoneCount implementation back to TelephonyManager. 

Moving it inside iTelephony creates problems. Some components call
getPhoneCount during initialization while iTelephony service is not
even running, which will cause phone process to crash.

Bug: 123667461
Test: manual
Change-Id: I097d4694a1b0957420ba4636ed8b4b1b89d63500
parent f6ca5c23

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

+1 −23
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ public class PhoneConfigurationManager { 
                    + numOfSims + " sims, exiting!");

            return;

        }

        if (getNumOfActiveSims() != numOfSims) {

        if (getPhoneCount() != numOfSims) {

            Message callback = Message.obtain(

                    mHandler, EVENT_SWITCH_DSDS_CONFIG_DONE, numOfSims);

            mRadioConfig.setModemsConfig(numOfSims, callback);
@@ -175,28 +175,6 @@ public class PhoneConfigurationManager { 
        }

    }



    /**

     * Get how many sims have been activated on the phone

     * NOTE: In order to support more than 3 sims, we need to change this method.

     */

    public int getNumOfActiveSims() {

        String mSimConfig =

                SystemProperties.get(TelephonyProperties.PROPERTY_MULTI_SIM_CONFIG);

        int numOfSims;

        switch (mSimConfig) {

            case TSTS:

                numOfSims = 3;

                break;

            case DSDA:

            case DSDS:

                numOfSims = 2;

                break;

            default:

                numOfSims = 1;

        }

        return numOfSims;

    }



    /**

     * Get whether reboot is required or not after making changes to modem configurations.

     * Return value defaults to false