diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-05 13:34:25 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-05 13:34:25 -0700 |
commit | b1c2874790908d1bbb9b99242fc7cc96c7b45a8a (patch) | |
tree | 8ec05f122d1469d0233c887254f532eda2e926c7 | |
parent | 7b0d2d933d8a601cf6259f25576f5615ff146b33 (diff) | |
parent | 9c9151eccd27e824fdb7c266bff78c10038e87fe (diff) | |
download | frameworks_base-b1c2874790908d1bbb9b99242fc7cc96c7b45a8a.zip frameworks_base-b1c2874790908d1bbb9b99242fc7cc96c7b45a8a.tar.gz frameworks_base-b1c2874790908d1bbb9b99242fc7cc96c7b45a8a.tar.bz2 |
Merge change 3305 into donut
* changes:
Fix parameter mismatch for a couple of RIL commands.
-rw-r--r-- | telephony/java/com/android/internal/telephony/RIL.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java index 0cdeeff..7b486e7 100644 --- a/telephony/java/com/android/internal/telephony/RIL.java +++ b/telephony/java/com/android/internal/telephony/RIL.java @@ -1807,7 +1807,6 @@ public final class RIL extends BaseCommands implements CommandsInterface { public void setSmscAddress(String address, Message result) { RILRequest rr = RILRequest.obtain(RIL_REQUEST_SET_SMSC_ADDRESS, result); - rr.mp.writeInt(1); rr.mp.writeString(address); if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) @@ -3122,6 +3121,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { case RIL_REQUEST_GET_SMSC_ADDRESS: return "RIL_REQUEST_GET_SMSC_ADDRESS"; case RIL_REQUEST_SET_SMSC_ADDRESS: return "RIL_REQUEST_SET_SMSC_ADDRESS"; case RIL_REQUEST_EXIT_EMERGENCY_CALLBACK_MODE: return "REQUEST_EXIT_EMERGENCY_CALLBACK_MODE"; + case RIL_REQUEST_REPORT_SMS_MEMORY_STATUS: return "RIL_REQUEST_REPORT_SMS_MEMORY_STATUS"; default: return "<unknown request>"; } } @@ -3290,7 +3290,6 @@ public final class RIL extends BaseCommands implements CommandsInterface { sendCDMAFeatureCode(String FeatureCode, Message response) { RILRequest rr = RILRequest.obtain(RIL_REQUEST_CDMA_FLASH, response); - rr.mp.writeInt(1); rr.mp.writeString(FeatureCode); if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest) |