Adding missing RpcParam annotations to telephony and wifi Rpcs.
Bug: 29643732
Change-Id: I417258e3e6a645902ef069f72da78a22d6c8e2ea
diff --git a/Common/src/com/googlecode/android_scripting/facade/telephony/CarrierConfigFacade.java b/Common/src/com/googlecode/android_scripting/facade/telephony/CarrierConfigFacade.java
index fc4d061..5841660 100644
--- a/Common/src/com/googlecode/android_scripting/facade/telephony/CarrierConfigFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/telephony/CarrierConfigFacade.java
@@ -47,7 +47,9 @@
}
@Rpc(description = "Tethering Entitlement Check")
- public boolean carrierConfigIsTetheringModeAllowed(String mode, Integer timeout) {
+ public boolean carrierConfigIsTetheringModeAllowed(
+ @RpcParameter(name="mode") String mode,
+ @RpcParameter(name="timeout") Integer timeout) {
String[] mProvisionApp = mService.getResources().getStringArray(
com.android.internal.R.array.config_mobile_hotspot_provision_app);
/* following check defined in
diff --git a/Common/src/com/googlecode/android_scripting/facade/telephony/SubscriptionManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/telephony/SubscriptionManagerFacade.java
index 0031bc1..e8e6687 100644
--- a/Common/src/com/googlecode/android_scripting/facade/telephony/SubscriptionManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/telephony/SubscriptionManagerFacade.java
@@ -103,7 +103,9 @@
}
@Rpc(description = "Set Data Roaming Enabled or Disabled for a particular Subscription ID")
- public Integer subscriptionSetDataRoaming(Integer roaming, Integer subId) {
+ public Integer subscriptionSetDataRoaming(
+ @RpcParameter(name = "roaming") Integer roaming,
+ @RpcParameter(name = "subId") Integer subId) {
if (roaming != SubscriptionManager.DATA_ROAMING_DISABLE) {
return mSubscriptionManager.setDataRoaming(
SubscriptionManager.DATA_ROAMING_ENABLE, subId);
diff --git a/Common/src/com/googlecode/android_scripting/facade/telephony/TelecomManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/telephony/TelecomManagerFacade.java
index 9714d74..e138709 100644
--- a/Common/src/com/googlecode/android_scripting/facade/telephony/TelecomManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/telephony/TelecomManagerFacade.java
@@ -79,6 +79,7 @@
@Rpc(description = "If there's a ringing call, accept on behalf of the user.")
public void telecomAcceptRingingCall(
+ @RpcParameter(name = "videoState")
@RpcOptional
String videoState) {
diff --git a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyManagerFacade.java
index b027ca8..6027ab2 100644
--- a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyManagerFacade.java
@@ -255,17 +255,19 @@
@Rpc(description = "Turn on/off precise listening on fore/background or" +
" ringing calls for default voice subscription ID.")
- public Boolean telephonyAdjustPreciseCallStateListenLevel(String type,
- Boolean listen) {
+ public Boolean telephonyAdjustPreciseCallStateListenLevel(
+ @RpcParameter(name = "type") String type,
+ @RpcParameter(name = "listen") Boolean listen) {
return telephonyAdjustPreciseCallStateListenLevelForSubscription(type, listen,
SubscriptionManager.getDefaultVoiceSubscriptionId());
}
@Rpc(description = "Turn on/off precise listening on fore/background or" +
" ringing calls for specified subscription ID.")
- public Boolean telephonyAdjustPreciseCallStateListenLevelForSubscription(String type,
- Boolean listen,
- @RpcParameter(name = "subId") Integer subId) {
+ public Boolean telephonyAdjustPreciseCallStateListenLevelForSubscription(
+ @RpcParameter(name = "type") String type,
+ @RpcParameter(name = "listen") Boolean listen,
+ @RpcParameter(name = "subId") Integer subId) {
StateChangeListener listener = getStateChangeListenerForSubscription(subId, true);
if(listener == null) {
Log.e("Invalid subscription ID");
@@ -1050,7 +1052,8 @@
}
@Rpc(description = "Enables or Disables Video Calling()")
- public void telephonyEnableVideoCalling(boolean enable) {
+ public void telephonyEnableVideoCalling(
+ @RpcParameter(name = "enable") boolean enable) {
mTelephonyManager.enableVideoCalling(enable);
}
diff --git a/Common/src/com/googlecode/android_scripting/facade/wifi/HttpFacade.java b/Common/src/com/googlecode/android_scripting/facade/wifi/HttpFacade.java
index 75bf888..45036c1 100644
--- a/Common/src/com/googlecode/android_scripting/facade/wifi/HttpFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/wifi/HttpFacade.java
@@ -102,7 +102,7 @@
@Rpc(description = "Start waiting for a connection request on a specified port.",
returns = "The index of the connection.")
- public Integer httpAcceptConnection(Integer port) throws IOException {
+ public Integer httpAcceptConnection(@RpcParameter(name = "port") Integer port) throws IOException {
mServerSocket = new ServerSocket(port);
if (mServerTimeout > 0) {
mServerSocket.setSoTimeout(mServerTimeout);
@@ -114,7 +114,7 @@
}
@Rpc(description = "Download a file from specified url.")
- public void httpDownloadFile(String url) throws IOException {
+ public void httpDownloadFile(@RpcParameter(name = "url") String url) throws IOException {
HttpURLConnection urlConnection = httpRequest(url);
String filename = null;
String contentDisposition = urlConnection.getHeaderField("Content-Disposition");
diff --git a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java
index 2afa329..6d48ba9 100755
--- a/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/wifi/WifiManagerFacade.java
@@ -464,7 +464,8 @@
}
@Rpc(description = "test.")
- public String wifiTest(String certString) throws CertificateException, IOException {
+ public String wifiTest(
+ @RpcParameter(name = "certString") String certString) throws CertificateException, IOException {
// TODO(angli): Make this work. Convert a X509Certificate back to a string.
X509Certificate caCert = strToX509Cert(certString);
caCert.getEncoded();
