summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-06-05 21:17:09 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-06-05 21:17:09 -0700
commit5a7f38922e9d32fea6bbdce305a0e2aebb6b5b10 (patch)
tree26792e2c42c7b770285b825f8d6f93187aab6247
parentfa4d817851ee0db782bfa2368a13d9761f62b2ce (diff)
parentb1c2874790908d1bbb9b99242fc7cc96c7b45a8a (diff)
downloadframeworks_base-5a7f38922e9d32fea6bbdce305a0e2aebb6b5b10.zip
frameworks_base-5a7f38922e9d32fea6bbdce305a0e2aebb6b5b10.tar.gz
frameworks_base-5a7f38922e9d32fea6bbdce305a0e2aebb6b5b10.tar.bz2
am b1c28747: Merge change 3305 into donut
Merge commit 'b1c2874790908d1bbb9b99242fc7cc96c7b45a8a' * commit 'b1c2874790908d1bbb9b99242fc7cc96c7b45a8a': Fix parameter mismatch for a couple of RIL commands.
-rw-r--r--telephony/java/com/android/internal/telephony/RIL.java3
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)