From d31fdf05659bcd87fb8b989931f540f5e739fb22 Mon Sep 17 00:00:00 2001
From: Wink Saville <wink@google.com>
Date: Wed, 6 Apr 2011 16:55:39 -0700
Subject: [PATCH] Add getCdmaSubscriptionSource to CommandsInterface.

This was accidentally not added previously and it had an
extra parameter.

Change-Id: Ic48ab9e637a5343b63d3e03377acd2679b0f77e0
---
 .../com/android/internal/telephony/CommandsInterface.java   | 6 ++++++
 telephony/java/com/android/internal/telephony/RIL.java      | 6 +++---
 .../android/internal/telephony/sip/SipCommandInterface.java | 4 ++++
 .../android/internal/telephony/test/SimulatedCommands.java  | 5 +++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/telephony/java/com/android/internal/telephony/CommandsInterface.java b/telephony/java/com/android/internal/telephony/CommandsInterface.java
index 9e1e0c66ed6ad..99217b3b716e1 100644
--- a/telephony/java/com/android/internal/telephony/CommandsInterface.java
+++ b/telephony/java/com/android/internal/telephony/CommandsInterface.java
@@ -1440,6 +1440,12 @@ public interface CommandsInterface {
      */
     void setCdmaSubscriptionSource(int cdmaSubscriptionType, Message response);
 
+    /**
+     *  Requests to get the CDMA subscription srouce
+     * @param response is callback message
+     */
+    void getCdmaSubscriptionSource(Message response);
+
     /**
      *  Set the TTY mode
      *
diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java
index 1d474052a8fe0..b0a265bf36a35 100644
--- a/telephony/java/com/android/internal/telephony/RIL.java
+++ b/telephony/java/com/android/internal/telephony/RIL.java
@@ -3634,12 +3634,12 @@ public final class RIL extends BaseCommands implements CommandsInterface {
     /**
      * {@inheritDoc}
      */
-    public void getCdmaSubscriptionSource(int cdmaSubscription , Message response) {
+    @Override
+    public void getCdmaSubscriptionSource(Message response) {
         RILRequest rr = RILRequest.obtain(
                 RILConstants.RIL_REQUEST_CDMA_GET_SUBSCRIPTION_SOURCE, response);
 
-        if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest)
-                + " : " + cdmaSubscription);
+        if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
         send(rr);
     }
diff --git a/telephony/java/com/android/internal/telephony/sip/SipCommandInterface.java b/telephony/java/com/android/internal/telephony/sip/SipCommandInterface.java
index f2ece7fc6234d..5208ccda5f93d 100644
--- a/telephony/java/com/android/internal/telephony/sip/SipCommandInterface.java
+++ b/telephony/java/com/android/internal/telephony/sip/SipCommandInterface.java
@@ -326,6 +326,10 @@ class SipCommandInterface extends BaseCommands implements CommandsInterface {
     public void reportStkServiceIsRunning(Message result) {
     }
 
+    @Override
+    public void getCdmaSubscriptionSource(Message response) {
+    }
+
     public void getGsmBroadcastConfig(Message response) {
     }
 
diff --git a/telephony/java/com/android/internal/telephony/test/SimulatedCommands.java b/telephony/java/com/android/internal/telephony/test/SimulatedCommands.java
index d9bd7e8761892..80de9f38c8510 100644
--- a/telephony/java/com/android/internal/telephony/test/SimulatedCommands.java
+++ b/telephony/java/com/android/internal/telephony/test/SimulatedCommands.java
@@ -1001,6 +1001,11 @@ public final class SimulatedCommands extends BaseCommands
         resultSuccess(result, null);
     }
 
+    @Override
+    public void getCdmaSubscriptionSource(Message result) {
+        unimplemented(result);
+    }
+
     private boolean isSimLocked() {
         if (mSimLockedState != SimLockState.NONE) {
             return true;