Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not get CM instance in getActiveModemCount unless needed." am: 31bbebe179 am: 94486daaa2

Browse Source 
Change-Id: I5ceb9b78bd2afc146279e87128500c853be79278
This commit is contained in:
Automerger Merge Worker
2019-12-13 18:52:15 +00:00
parent 4c1644cdf0 94486daaa2
commit 3c2fdd6805
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -427,14 +427,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)) {
modemCount = MODEM_COUNT_NO_MODEM;
} else {
modemCount = MODEM_COUNT_SINGLE_MODEM;
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;
}
}
break;
case DSDS: