Reworking tel/test_cases directory
Change-Id: I72ac8c87802e1b4933b9f57e398f98c3a4e2863b
diff --git a/Common/src/com/googlecode/android_scripting/facade/tele/ImsManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/tele/ImsManagerFacade.java
index 35879fd..bc89f21 100755
--- a/Common/src/com/googlecode/android_scripting/facade/tele/ImsManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/tele/ImsManagerFacade.java
@@ -43,7 +43,7 @@
mService = manager.getService();
mContext = mService.getBaseContext();
mImsManager = ImsManager.getInstance(mContext,
- SubscriptionManager.getDefaultVoiceSubId());
+ SubscriptionManager.getDefaultVoicePhoneId());
}
@Rpc(description = "Return True if Enhanced 4g Lte mode is enabled by platform.")
diff --git a/Common/src/com/googlecode/android_scripting/facade/tele/PhoneFacade.java b/Common/src/com/googlecode/android_scripting/facade/tele/PhoneFacade.java
index 540b252..f67b246 100755
--- a/Common/src/com/googlecode/android_scripting/facade/tele/PhoneFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/tele/PhoneFacade.java
@@ -128,34 +128,52 @@
}
@Rpc(description = "Set preferred network setting.")
- public boolean phoneSetPreferredNetworkType(String mode){
+ public boolean phoneSetPreferredNetworkType(String mode) {
int networkType;
int phoneType = mTelephonyManager.getPhoneType();
if (phoneType == TelephonyManager.PHONE_TYPE_GSM) {
- if (mode.equalsIgnoreCase("LTE")) {
- networkType = RILConstants.NETWORK_MODE_LTE_GSM_WCDMA;
- } else if (mode.equalsIgnoreCase("Global")) {
- networkType = RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA;
- } else if (mode.equalsIgnoreCase("3G")) {
- networkType = RILConstants.NETWORK_MODE_WCDMA_PREF;
- } else if (mode.equalsIgnoreCase("2G")) {
- networkType = RILConstants.NETWORK_MODE_GSM_ONLY;
- } else {
- return false;
+ switch (mode.toUpperCase()) {
+ case "4G":
+ case "LTE":
+ networkType = RILConstants.NETWORK_MODE_LTE_GSM_WCDMA;
+ break;
+ case "3G":
+ case "WCDMA":
+ networkType = RILConstants.NETWORK_MODE_WCDMA_PREF;
+ break;
+ case "2G":
+ case "GSM":
+ networkType = RILConstants.NETWORK_MODE_GSM_ONLY;
+ break;
+ case "GLOBAL":
+ networkType =
+ RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA;
+ break;
+ default:
+ return false;
}
} else if (phoneType == TelephonyManager.PHONE_TYPE_CDMA) {
- if (mode.equalsIgnoreCase("LTE")) {
- networkType = RILConstants.NETWORK_MODE_LTE_CDMA_EVDO;
- } else if (mode.equalsIgnoreCase("Global")) {
- networkType = RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA;
- } else if (mode.equalsIgnoreCase("3G")) {
- networkType = RILConstants.NETWORK_MODE_CDMA;
- } else if (mode.equalsIgnoreCase("1X")) {
- networkType = RILConstants.NETWORK_MODE_CDMA_NO_EVDO;
- } else {
- return false;
+ switch (mode.toUpperCase()) {
+ case "4G":
+ case "LTE":
+ networkType = RILConstants.NETWORK_MODE_LTE_CDMA_EVDO;
+ break;
+ case "3G":
+ case "EVDO":
+ networkType = RILConstants.NETWORK_MODE_CDMA;
+ break;
+ case "2G":
+ case "1X":
+ networkType = RILConstants.NETWORK_MODE_CDMA_NO_EVDO;
+ break;
+ case "GLOBAL":
+ networkType =
+ RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA;
+ break;
+ default:
+ return false;
}
- } else{
+ } else {
return false;
}
Log.v("SL4A: Setting the preferred network setting to:" + networkType);
@@ -169,38 +187,43 @@
}
@Rpc(description = "Get preferred network setting. Return value is String.")
- public String phoneGetPreferredNetworkTypeString(){
+ public String phoneGetPreferredNetworkType() {
int mode = mTelephonyManager.getPreferredNetworkType();
int phoneType = mTelephonyManager.getPhoneType();
if (phoneType == TelephonyManager.PHONE_TYPE_GSM) {
- if (mode == RILConstants.NETWORK_MODE_LTE_GSM_WCDMA){
- return "LTE";
- } else if (mode == RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA){
- return "Global";
- } else if (mode == RILConstants.NETWORK_MODE_WCDMA_PREF) {
- return "3G";
- } else if (mode == RILConstants.NETWORK_MODE_GSM_ONLY) {
- return "2G";
- } else {
- Log.d("Unknown mode in phone type GSM: " + mode);
+ switch (mode) {
+ case RILConstants.NETWORK_MODE_LTE_GSM_WCDMA:
+ return "LTE";
+ case RILConstants.NETWORK_MODE_WCDMA_PREF:
+ return "WCDMA";
+ case RILConstants.NETWORK_MODE_GSM_ONLY:
+ return "GSM";
+ case RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
+ return "GLOBAL";
+ default:
+ Log.d("Unknown mode in phone type GSM: " + mode);
+ return "UNKNOWN";
}
- } else if (phoneType == TelephonyManager.PHONE_TYPE_CDMA){
- if (mode == RILConstants.NETWORK_MODE_LTE_CDMA_EVDO){
- return "LTE";
- } else if (mode == RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA){
- return "Global";
- } else if (mode == RILConstants.NETWORK_MODE_CDMA) {
- return "3G";
- } else if (mode == RILConstants.NETWORK_MODE_CDMA_NO_EVDO) {
- return "1X";
- } else {
- Log.d("Unknown mode in phone type CDMA: " + mode);
+ } else if (phoneType == TelephonyManager.PHONE_TYPE_CDMA) {
+ switch (mode) {
+ case RILConstants.NETWORK_MODE_LTE_CDMA_EVDO:
+ return "LTE";
+ case RILConstants.NETWORK_MODE_CDMA:
+ return "EVDO";
+ case RILConstants.NETWORK_MODE_CDMA_NO_EVDO:
+ return "1X";
+ case RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
+ return "GLOBAL";
+ default:
+ Log.d("Unknown mode in phone type CDMA: " + mode);
+ return "UNKNOWN";
}
} else {
Log.d("Unknown phone type: " + phoneType);
+ return null;
}
- return null;
}
+
@Rpc(description = "Starts tracking call state change.")
public void phoneStartTrackingCallState() {
@@ -713,6 +736,11 @@
}
}
+ @Rpc(description = "Returns a boolean of isImsRegistered()")
+ public Boolean isImsRegistered() {
+ return mTelephonyManager.isImsRegistered();
+ }
+
@Override
public void shutdown() {
phoneStopTrackingCallStateChange();
