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

Merge "Move getPhoneCount implementation back to TelephonyManager."

Browse Source
This commit is contained in:
Xiangyu/Malcolm Chen
2019-02-20 02:58:09 +00:00
committed by Gerrit Code Review
parent 5bc4949f3f 1a1689a32c
commit 7d6e085229
2 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -363,27 +363,26 @@ public class TelephonyManager {
* Returns 3 for Tri standby mode.(Tri SIM functionality)
*/
public int getPhoneCount() {
int phoneCount = 0;
// check for voice and data support, 0 if not supported
if (!isVoiceCapable() && !isSmsCapable()) {
ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService(
Context.CONNECTIVITY_SERVICE);
if (cm != null) {
if (!cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
return phoneCount;
int phoneCount = 1;
switch (getMultiSimConfiguration()) {
case UNKNOWN:
ConnectivityManager cm = mContext == null ? null : (ConnectivityManager) mContext
.getSystemService(Context.CONNECTIVITY_SERVICE);
// check for voice and data support, 0 if not supported
if (!isVoiceCapable() && !isSmsCapable() && cm != null
&& !cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
phoneCount = 0;
} else {
phoneCount = 1;
}
}
}
phoneCount = 1;
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
phoneCount = telephony.getNumOfActiveSims();
}
} catch (RemoteException ex) {
Rlog.e(TAG, "getNumOfActiveSims RemoteException", ex);
break;
case DSDS:
case DSDA:
phoneCount = PhoneConstants.MAX_PHONE_COUNT_DUAL_SIM;
break;
case TSTS:
phoneCount = PhoneConstants.MAX_PHONE_COUNT_TRI_SIM;
break;
}
return phoneCount;
}

5
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -1836,11 +1836,6 @@ interface ITelephony {
* @hide
*/
void switchMultiSimConfig(int numOfSims);
/**
* Get how many modems have been activated on the phone
* @hide
*/
int getNumOfActiveSims();
/**
* Get if reboot is required upon altering modems configurations