Merge commit 'f606e5cc' into fix-merge-conflict
Wink Saville [Thu, 21 Mar 2013 14:14:11 +0000 (07:14 -0700)]
* commit 'f606e5cc':
  RIL: Correct the RIL_REQUEST_DIAL api missmatch

Conflicts:
src/java/com/android/internal/telephony/RIL.java

Change-Id: Ib2b477628e14ca221acad35f4a2cf9a44170a33e

1  2 
src/java/com/android/internal/telephony/RIL.java

@@@ -885,17 -873,16 +885,16 @@@ public final class RIL extends BaseComm
      dial(String address, int clirMode, UUSInfo uusInfo, Message result) {
          RILRequest rr = RILRequest.obtain(RIL_REQUEST_DIAL, result);
  
 -        rr.mp.writeString(address);
 -        rr.mp.writeInt(clirMode);
 +        rr.mParcel.writeString(address);
 +        rr.mParcel.writeInt(clirMode);
-         rr.mParcel.writeInt(0); // UUS information is absent
  
          if (uusInfo == null) {
 -            rr.mp.writeInt(0); // UUS information is absent
 +            rr.mParcel.writeInt(0); // UUS information is absent
          } else {
 -            rr.mp.writeInt(1); // UUS information is present
 -            rr.mp.writeInt(uusInfo.getType());
 -            rr.mp.writeInt(uusInfo.getDcs());
 -            rr.mp.writeByteArray(uusInfo.getUserData());
 +            rr.mParcel.writeInt(1); // UUS information is present
 +            rr.mParcel.writeInt(uusInfo.getType());
 +            rr.mParcel.writeInt(uusInfo.getDcs());
 +            rr.mParcel.writeByteArray(uusInfo.getUserData());
          }
  
          if (RILJ_LOGD) riljLog(rr.serialString() + "> " + requestToString(rr.mRequest));