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

Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev

Browse Source 
am: fc6a3ad85b

* commit 'fc6a3ad85bcac1df6b0fc1f79ec65f1a23eb8f71':
  Change to return phone count as 0 if voice, sms, data not supported.

Change-Id: Ideaaec05272ecee36504e7207d1187a7d2cdcd5f
This commit is contained in:
Amit Mahajan
2016-05-02 21:47:50 +00:00
committed by android-build-merger
parent b76fa59731 fc6a3ad85b
commit dbb0028be0
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@ import android.app.ActivityThread;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.ConnectivityManager;
import android.net.Uri; import android.net.Uri;
import android.os.BatteryStats; import android.os.BatteryStats;
import android.os.ResultReceiver; import android.os.ResultReceiver;
@@ -183,6 +184,7 @@ public class TelephonyManager {
/** /**
* Returns the number of phones available. * Returns the number of phones available.
* Returns 0 if none of voice, sms, data is not supported
* Returns 1 for Single standby mode (Single SIM functionality) * Returns 1 for Single standby mode (Single SIM functionality)
* Returns 2 for Dual standby mode.(Dual SIM functionality) * Returns 2 for Dual standby mode.(Dual SIM functionality)
*/ */
@@ -190,7 +192,28 @@ public class TelephonyManager {
int phoneCount = 1; int phoneCount = 1;
switch (getMultiSimConfiguration()) { switch (getMultiSimConfiguration()) {
case UNKNOWN: case UNKNOWN:
phoneCount = 1; // if voice or sms or data is supported, return 1 otherwise 0
if (isVoiceCapable() || isSmsCapable()) {
phoneCount = 1;
} else {
// todo: try to clean this up further by getting rid of the nested conditions
if (mContext == null) {
phoneCount = 1;
} else {
// check for data support
ConnectivityManager cm = (ConnectivityManager)mContext.getSystemService(
Context.CONNECTIVITY_SERVICE);
if (cm == null) {
phoneCount = 1;
} else {
if (cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
phoneCount = 1;
} else {
phoneCount = 0;
}
}
}
}
break; break;
case DSDS: case DSDS:
case DSDA: case DSDA: