am c5b28bd: Merge "Change DCS of MO SMS to the correct value for UCS-2 encoding." into ics-mr0

Jake Hamby · Android Git Automerger · commit 690c9df12cc4 · 2011-10-11T17:32:53.000-07:00
* commit 'c5b28bd00dd1be682103275815f588870c6fec7d':
  Change DCS of MO SMS to the correct value for UCS-2 encoding.
diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
@@ -300,8 +300,8 @@ public static SubmitPdu getSubmitPdu(String scAddress,
                 return null;
             }
             // TP-Data-Coding-Scheme
-            // Class 3, UCS-2 encoding, uncompressed
-            bo.write(0x0b);
+            // UCS-2 encoding, uncompressed
+            bo.write(0x08);
         }
 
         // (no TP-Validity-Period)

Original file line number	Diff line number	Diff line change
`@@ -300,8 +300,8 @@ public static SubmitPdu getSubmitPdu(String scAddress,`
`300`	`300`	`return null;`
`301`	`301`	`}`
`302`	`302`	`// TP-Data-Coding-Scheme`
`303`		`- // Class 3, UCS-2 encoding, uncompressed`
`304`		`- bo.write(0x0b);`
	`303`	`+ // UCS-2 encoding, uncompressed`
	`304`	`+ bo.write(0x08);`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`// (no TP-Validity-Period)`