commit 759a77e50211b9b1ba937f9ff89ae1fa35ca88e9
author Android (Google) Code Review <android-gerrit@google.com> Wed Dec 23 16:48:20 2009 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 23 16:48:20 2009 -0800
tree ece298255d5943964e1b13cf294ab2b91e3fed35
parent 2ce9a190449bf495edcf2931bf172d1e1dcb94b5
parent 0fa1b24593bbe7972bfbc5290519359db8c4ade6

Merge change I0fa1b245

* changes:
  telephony: Populate the User-to-user signaling info fields.

telephony/java/com/android/internal/telephony/RIL.java

diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java
index 279f57f..1ffcf9b 100644
--- a/telephony/java/com/android/internal/telephony/RIL.java
+++ b/telephony/java/com/android/internal/telephony/RIL.java
@@ -800,6 +800,7 @@
 
         rr.mp.writeString(address);
         rr.mp.writeInt(clirMode);
+        rr.mp.writeInt(0); // UUS information is absent
 
         if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));
 
@@ -2824,6 +2825,13 @@
             dc.numberPresentation = DriverCall.presentationFromCLIP(np);
             dc.name = p.readString();
             dc.namePresentation = p.readInt();
+            int uusInfoPresent = p.readInt();
+            if (uusInfoPresent == 1) {
+                // TODO: Copy the data to dc to forward to the apps.
+                p.readInt();
+                p.readInt();
+                p.createByteArray();
+            }
 
             // Make sure there's a leading + on addresses with a TOA of 145
             dc.number = PhoneNumberUtils.stringFromStringAndTOA(dc.number, dc.TOA);