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

Commit 94486daa authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by android-build-merger
Browse files

Merge "Do not get CM instance in getActiveModemCount unless needed." 

am: 31bbebe1

Change-Id: I3f297869c9b6a2109cd1115cdd447c774fd9d308
parents 1099497d 31bbebe1

telephony/java/android/telephony/TelephonyManager.java

+7 −7
Original line number Diff line number Diff line
@@ -416,14 +416,14 @@ public class TelephonyManager { 
        int modemCount = 1;

        switch (getMultiSimConfiguration()) {

            case UNKNOWN:

                ConnectivityManager cm = mContext == null ? null : (ConnectivityManager) mContext

                        .getSystemService(Context.CONNECTIVITY_SERVICE);

                modemCount = MODEM_COUNT_SINGLE_MODEM;

                // check for voice and data support, 0 if not supported

                if (!isVoiceCapable() && !isSmsCapable() && cm != null

                        && !cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {

                if (!isVoiceCapable() && !isSmsCapable() && mContext != null) {

                    ConnectivityManager cm = (ConnectivityManager) mContext

                            .getSystemService(Context.CONNECTIVITY_SERVICE);

                    if (cm != null && !cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {

                        modemCount = MODEM_COUNT_NO_MODEM;

                } else {

                    modemCount = MODEM_COUNT_SINGLE_MODEM;

                    }

                }

                break;

            case DSDS: