diff options
author | Wink Saville <wink@google.com> | 2011-04-06 17:54:11 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-06 17:54:11 -0700 |
commit | 004da7e2e0287cdad63a9009841309d45f038787 (patch) | |
tree | 785d476f3221f9643e25e15913e5249c00136629 /telephony | |
parent | 2059bdf34793dc75448e5cb6201db6c49a3a8e18 (diff) | |
parent | 1b87f1db89e82d00445a43c4593d8c5ea5d2633f (diff) | |
download | frameworks_base-004da7e2e0287cdad63a9009841309d45f038787.zip frameworks_base-004da7e2e0287cdad63a9009841309d45f038787.tar.gz frameworks_base-004da7e2e0287cdad63a9009841309d45f038787.tar.bz2 |
am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE
* commit '1b87f1db89e82d00445a43c4593d8c5ea5d2633f':
Add getCdmaSubscriptionSource to CommandsInterface.
Diffstat (limited to 'telephony')
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 9e1e0c6..99217b3 100644 --- a/telephony/java/com/android/internal/telephony/CommandsInterface.java +++ b/telephony/java/com/android/internal/telephony/CommandsInterface.java @@ -1441,6 +1441,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 * * @param ttyMode one of the following: diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java index 1d47405..b0a265b 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 f2ece7f..5208ccd 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 d9bd7e8..80de9f3 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; |