DO NOT MERGE Unhiding MSIM APIs.
1. Unhide MSIM APIs in TelephonyManager that already have non-MSIM equivalent
APIs public.
2. Make MSIM API naming consistent (overloaded, no suffix).
3. Unhide APIs in SubscriptionManager that are necessary for MSIM.
Bug: 26772894
Change-Id: Idb86a736f2c7a11eec190aaaa93d77fec7a7fcf9
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/SubscriptionManagerFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/SubscriptionManagerFacade.java
index 84f34b8..0031bc1 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/SubscriptionManagerFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/SubscriptionManagerFacade.java
@@ -46,12 +46,12 @@
@Rpc(description = "Return the default subscription ID")
public Integer subscriptionGetDefaultSubId() {
- return SubscriptionManager.getDefaultSubId();
+ return SubscriptionManager.getDefaultSubscriptionId();
}
@Rpc(description = "Return the default data subscription ID")
public Integer subscriptionGetDefaultDataSubId() {
- return SubscriptionManager.getDefaultDataSubId();
+ return SubscriptionManager.getDefaultDataSubscriptionId();
}
@Rpc(description = "Set the default data subscription ID")
@@ -63,7 +63,7 @@
@Rpc(description = "Return the default voice subscription ID")
public Integer subscriptionGetDefaultVoiceSubId() {
- return SubscriptionManager.getDefaultVoiceSubId();
+ return SubscriptionManager.getDefaultVoiceSubscriptionId();
}
@Rpc(description = "Set the default voice subscription ID")
@@ -75,7 +75,7 @@
@Rpc(description = "Return the default sms subscription ID")
public Integer subscriptionGetDefaultSmsSubId() {
- return SubscriptionManager.getDefaultSmsSubId();
+ return SubscriptionManager.getDefaultSmsSubscriptionId();
}
@Rpc(description = "Set the default sms subscription ID")
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelecomManagerFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelecomManagerFacade.java
index 6816c30..159ee49 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelecomManagerFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelecomManagerFacade.java
@@ -239,7 +239,7 @@
@RpcOptional
Boolean enabled) {
toggleCallWaitingForSubscription(
- SubscriptionManager.getDefaultVoiceSubId(), enabled);
+ SubscriptionManager.getDefaultVoiceSubscriptionId(), enabled);
}
@Rpc(description = "Toggles call waiting feature on or off for specified subscription id.")
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyManagerFacade.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyManagerFacade.java
index fd4096e..330b9d3 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyManagerFacade.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyManagerFacade.java
@@ -161,7 +161,7 @@
public boolean telephonySetPreferredNetworkTypes(
@RpcParameter(name = "nwPreference") String nwPreference) {
return telephonySetPreferredNetworkTypesForSubscription(nwPreference,
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Set network preference for subscription.")
@@ -181,7 +181,7 @@
@Rpc(description = "Get network preference.")
public String telephonyGetPreferredNetworkTypes() {
return telephonyGetPreferredNetworkTypesForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Get network preference for subscription.")
@@ -194,7 +194,7 @@
@Rpc(description = "Get current voice network type")
public String telephonyGetCurrentVoiceNetworkType() {
return telephonyGetCurrentVoiceNetworkTypeForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Get current voice network type for subscription")
@@ -207,7 +207,7 @@
@Rpc(description = "Get current data network type")
public String telephonyGetCurrentDataNetworkType() {
return telephonyGetCurrentDataNetworkTypeForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Get current data network type for subscription")
@@ -226,7 +226,7 @@
"default subscription ID .Return value is integer.")
public int telephonyGetPreferredNetworkTypeInteger() {
return telephonyGetPreferredNetworkTypeIntegerForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Get preferred network setting for " +
@@ -240,7 +240,7 @@
"for default subscription ID.")
public Boolean telephonyStartTrackingCallState() {
return telephonyStartTrackingCallStateForSubscription(
- SubscriptionManager.getDefaultVoiceSubId());
+ SubscriptionManager.getDefaultVoiceSubscriptionId());
}
@Rpc(description = "Starts tracking call state change" +
@@ -262,7 +262,7 @@
"for default subscription ID.")
public Boolean telephonyStartTrackingCellInfoChange() {
return telephonyStartTrackingCellInfoChangeForSubscription(
- SubscriptionManager.getDefaultVoiceSubId());
+ SubscriptionManager.getDefaultVoiceSubscriptionId());
}
@Rpc(description = "Starts tracking cell info change" +
@@ -285,7 +285,7 @@
public Boolean telephonyAdjustPreciseCallStateListenLevel(String type,
Boolean listen) {
return telephonyAdjustPreciseCallStateListenLevelForSubscription(type, listen,
- SubscriptionManager.getDefaultVoiceSubId());
+ SubscriptionManager.getDefaultVoiceSubscriptionId());
}
@Rpc(description = "Turn on/off precise listening on fore/background or" +
@@ -312,7 +312,7 @@
"for default voice subscription ID.")
public Boolean telephonyStopTrackingCellInfoChange() {
return telephonyStopTrackingCellInfoChangeForSubscription(
- SubscriptionManager.getDefaultVoiceSubId());
+ SubscriptionManager.getDefaultVoiceSubscriptionId());
}
@Rpc(description = "Stops tracking cell info change " +
@@ -333,7 +333,7 @@
"for default voice subscription ID.")
public Boolean telephonyStopTrackingCallStateChange() {
return telephonyStopTrackingCallStateChangeForSubscription(
- SubscriptionManager.getDefaultVoiceSubId());
+ SubscriptionManager.getDefaultVoiceSubscriptionId());
}
@Rpc(description = "Stops tracking call state change " +
@@ -355,7 +355,7 @@
"for default subscription ID.")
public Boolean telephonyStartTrackingDataConnectionRTInfoChange() {
return telephonyStartTrackingDataConnectionRTInfoChangeForSubscription(
- SubscriptionManager.getDefaultDataSubId());
+ SubscriptionManager.getDefaultDataSubscriptionId());
}
@Rpc(description = "Starts tracking data connection real time info change" +
@@ -377,7 +377,7 @@
"for default subscription ID.")
public Boolean telephonyStopTrackingDataConnectionRTInfoChange() {
return telephonyStopTrackingDataConnectionRTInfoChangeForSubscription(
- SubscriptionManager.getDefaultDataSubId());
+ SubscriptionManager.getDefaultDataSubscriptionId());
}
@Rpc(description = "Stops tracking data connection real time info change" +
@@ -399,7 +399,7 @@
"for default subscription ID..")
public Boolean telephonyStartTrackingDataConnectionStateChange() {
return telephonyStartTrackingDataConnectionStateChangeForSubscription(
- SubscriptionManager.getDefaultDataSubId());
+ SubscriptionManager.getDefaultDataSubscriptionId());
}
@Rpc(description = "Starts tracking data connection state change" +
@@ -421,7 +421,7 @@
"for default subscription ID..")
public Boolean telephonyStopTrackingDataConnectionStateChange() {
return telephonyStopTrackingDataConnectionStateChangeForSubscription(
- SubscriptionManager.getDefaultDataSubId());
+ SubscriptionManager.getDefaultDataSubscriptionId());
}
@Rpc(description = "Stops tracking data connection state change " +
@@ -443,7 +443,7 @@
"for default subscription ID.")
public Boolean telephonyStartTrackingServiceStateChange() {
return telephonyStartTrackingServiceStateChangeForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Starts tracking service state change " +
@@ -465,7 +465,7 @@
"for default subscription ID.")
public Boolean telephonyStopTrackingServiceStateChange() {
return telephonyStopTrackingServiceStateChangeForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Stops tracking service state change " +
@@ -487,7 +487,7 @@
"for default subscription ID.")
public Boolean telephonyStartTrackingVoiceMailStateChange() {
return telephonyStartTrackingVoiceMailStateChangeForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Starts tracking voice mail state change " +
@@ -509,7 +509,7 @@
"for default subscription ID.")
public Boolean telephonyStopTrackingVoiceMailStateChange() {
return telephonyStopTrackingVoiceMailStateChangeForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Stops tracking voice mail state change " +
@@ -542,21 +542,21 @@
"for default subscription ID")
public String telephonyGetNetworkOperator() {
return telephonyGetNetworkOperatorForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Returns the numeric name (MCC+MNC) of registered operator" +
"for specified subscription ID.")
public String telephonyGetNetworkOperatorForSubscription(
@RpcParameter(name = "subId") Integer subId) {
- return mTelephonyManager.getNetworkOperatorForSubscription(subId);
+ return mTelephonyManager.getNetworkOperator(subId);
}
@Rpc(description = "Returns the alphabetic name of current registered operator" +
"for specified subscription ID.")
public String telephonyGetNetworkOperatorName() {
return telephonyGetNetworkOperatorNameForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Returns the alphabetic name of registered operator " +
@@ -575,7 +575,7 @@
" or getDataNetworkTpe()");
return telephonyGetNetworkTypeForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Returns the current RAT in use on the device" +
@@ -594,7 +594,7 @@
" the default voice subscription.")
public String telephonyGetVoiceNetworkType() {
return telephonyGetVoiceNetworkTypeForSubscription(
- SubscriptionManager.getDefaultVoiceSubId());
+ SubscriptionManager.getDefaultVoiceSubscriptionId());
}
@Rpc(description = "Returns the current voice RAT for" +
@@ -608,7 +608,7 @@
" the defaut data subscription")
public String telephonyGetDataNetworkType() {
return telephonyGetDataNetworkTypeForSubscription(
- SubscriptionManager.getDefaultDataSubId());
+ SubscriptionManager.getDefaultDataSubscriptionId());
}
@Rpc(description = "Returns the current data RAT for" +
@@ -637,7 +637,7 @@
@Rpc(description = "Returns the MCC for default subscription ID")
public String telephonyGetSimCountryIso() {
return telephonyGetSimCountryIsoForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Get the latest power consumption stats from the modem")
@@ -655,7 +655,7 @@
@Rpc(description = "Returns the MCC+MNC for default subscription ID")
public String telephonyGetSimOperator() {
return telephonyGetSimOperatorForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Returns the MCC+MNC for specified subscription ID")
@@ -668,21 +668,21 @@
"for default subscription ID")
public String telephonyGetSimOperatorName() {
return telephonyGetSimOperatorNameForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Returns the Service Provider Name (SPN)" +
" for specified subscription ID.")
public String telephonyGetSimOperatorNameForSubscription(
@RpcParameter(name = "subId") Integer subId) {
- return mTelephonyManager.getSimOperatorNameForSubscription(subId);
+ return mTelephonyManager.getSimOperatorName(subId);
}
@Rpc(description = "Returns the serial number of the SIM for " +
"default subscription ID, or Null if unavailable")
public String telephonyGetSimSerialNumber() {
return telephonyGetSimSerialNumberForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Returns the serial number of the SIM for " +
@@ -732,7 +732,7 @@
public String telephonyGetIccSimChallengeResponse(@RpcParameter(name = "appType") Integer appType,
@RpcParameter(name = "hexChallenge") String hexChallenge) {
return telephonyGetIccSimChallengeResponseForSubscription(
- SubscriptionManager.getDefaultSubId(), appType, hexChallenge);
+ SubscriptionManager.getDefaultSubscriptionId(), appType, hexChallenge);
}
@Rpc(description = "Get Authentication Challenge Response from a " +
@@ -757,7 +757,7 @@
"for default subscription ID, or null if unavailable")
public String telephonyGetSubscriberId() {
return telephonyGetSubscriberIdForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Returns the unique subscriber ID (such as IMSI) " +
@@ -771,7 +771,7 @@
" voice mail number for default subscription ID.")
public String telephonyGetVoiceMailAlphaTag() {
return telephonyGetVoiceMailAlphaTagForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@@ -786,7 +786,7 @@
"for default subscription ID; null if unavailable.")
public String telephonyGetVoiceMailNumber() {
return telephonyGetVoiceMailNumberForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Returns the voice mail number " +
@@ -811,7 +811,7 @@
"for default subscription ID")
public Boolean telephonyCheckNetworkRoaming() {
return telephonyCheckNetworkRoamingForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Returns true if the device is in roaming state " +
@@ -851,7 +851,7 @@
"for specified subscription ID; null if unavailable")
public String telephonyGetLine1NumberForSubscription(
@RpcParameter(name = "subId") Integer subId) {
- return mTelephonyManager.getLine1NumberForSubscriber(subId);
+ return mTelephonyManager.getLine1Number(subId);
}
@Rpc(description = "Returns the Alpha Tag for the default subscription " +
@@ -864,7 +864,7 @@
"ID; null if unavailable")
public String telephonyGetLine1AlphaTagForSubscription(
@RpcParameter(name = "subId") Integer subId) {
- return mTelephonyManager.getLine1AlphaTagForSubscriber(subId);
+ return mTelephonyManager.getLine1AlphaTag(subId);
}
@Rpc(description = "Set the Line1-number (phone number) and Alpha Tag" +
@@ -883,7 +883,7 @@
@RpcParameter(name = "number") String number,
@RpcOptional
@RpcParameter(name = "alphaTag") String alphaTag) {
- return mTelephonyManager.setLine1NumberForDisplayForSubscriber(subId, alphaTag, number);
+ return mTelephonyManager.setLine1NumberForDisplay(subId, alphaTag, number);
}
@Rpc(description = "Returns the neighboring cell information of the device.")
@@ -909,7 +909,7 @@
"default data subscription ID.")
public Boolean telephonyIsDataEnabled() {
return telephonyIsDataEnabledForSubscription(
- SubscriptionManager.getDefaultDataSubId());
+ SubscriptionManager.getDefaultDataSubscriptionId());
}
@Rpc(description = "Returns True if data connection is enabled.")
@@ -924,7 +924,7 @@
@RpcParameter(name = "enabled")
@RpcOptional Boolean enabled) {
telephonyToggleDataConnectionForSubscription(
- SubscriptionManager.getDefaultDataSubId(), enabled);
+ SubscriptionManager.getDefaultDataSubscriptionId(), enabled);
}
@Rpc(description = "Toggles data connection on/off for" +
@@ -1107,7 +1107,7 @@
public String telephonyGetServiceState() {
//TODO: b/26273807 need to have framework API to get service state.
return telephonyGetServiceStateForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Returns the service state for specified subscription ID")
@@ -1120,7 +1120,7 @@
@Rpc(description = "Returns the call state for default subscription ID")
public String telephonyGetCallState() {
return telephonyGetCallStateForSubscription(
- SubscriptionManager.getDefaultSubId());
+ SubscriptionManager.getDefaultSubscriptionId());
}
@Rpc(description = "Returns the call state for specified subscription ID")
diff --git a/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyStateListeners.java b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyStateListeners.java
index 9d0f19b..5f7f14d 100644
--- a/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyStateListeners.java
+++ b/sl4a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyStateListeners.java
@@ -48,7 +48,7 @@
public CallStateChangeListener(EventFacade ef) {
super();
mEventFacade = ef;
- subscriptionId = SubscriptionManager.getDefaultVoiceSubId();
+ subscriptionId = SubscriptionManager.getDefaultVoiceSubscriptionId();
}
public CallStateChangeListener(EventFacade ef, int subId) {
@@ -164,7 +164,7 @@
public DataConnectionRealTimeInfoChangeListener(EventFacade ef) {
super();
mEventFacade = ef;
- subscriptionId = SubscriptionManager.getDefaultDataSubId();
+ subscriptionId = SubscriptionManager.getDefaultDataSubscriptionId();
}
public DataConnectionRealTimeInfoChangeListener(EventFacade ef, int subId) {
@@ -208,7 +208,7 @@
super();
mEventFacade = ef;
mTelephonyManager = tm;
- subscriptionId = SubscriptionManager.getDefaultDataSubId();
+ subscriptionId = SubscriptionManager.getDefaultDataSubscriptionId();
}
public DataConnectionStateChangeListener(EventFacade ef, TelephonyManager tm, int subId) {
@@ -254,7 +254,7 @@
public ServiceStateChangeListener(EventFacade ef) {
super();
mEventFacade = ef;
- subscriptionId = SubscriptionManager.getDefaultDataSubId();
+ subscriptionId = SubscriptionManager.getDefaultDataSubscriptionId();
}
public ServiceStateChangeListener(EventFacade ef, int subId) {
