filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use correct format info for SMS" am: a6f1ae137d am: 5089da9e20

Browse Source 
am: 71e2706105

Change-Id: I6686ffaea0c66b7bfa64d1016b7773e4a18e24e9
This commit is contained in:
Taesu Lee
2019-06-11 19:16:50 -07:00
committed by android-build-merger
parent 5c9504ba20 71e2706105
commit 3d4179e358
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/receiver/SmsReceiver.java
+1 -1
View File
@@ -192,7 +192,7 @@ public final class SmsReceiver extends BroadcastReceiver {
intent, EXTRA_SUB_ID); intent, EXTRA_SUB_ID);
deliverSmsMessages(context, subId, errorCode, messages); deliverSmsMessages(context, subId, errorCode, messages);
if (MmsUtils.isDumpSmsEnabled()) { if (MmsUtils.isDumpSmsEnabled()) {
final String format = null; final String format = intent.getStringExtra("format");
DebugUtils.dumpSms(messages[0].getTimestampMillis(), messages, format); DebugUtils.dumpSms(messages[0].getTimestampMillis(), messages, format);
} }
} }
src/com/android/messaging/sms/MmsUtils.java
+2 -1
View File
@@ -1194,7 +1194,8 @@ public class MmsUtils {
public static SmsMessage getSmsMessageFromDeliveryReport(final Intent intent) { public static SmsMessage getSmsMessageFromDeliveryReport(final Intent intent) {
final byte[] pdu = intent.getByteArrayExtra("pdu"); final byte[] pdu = intent.getByteArrayExtra("pdu");
return SmsMessage.createFromPdu(pdu); final String format = intent.getStringExtra("format");
return SmsMessage.createFromPdu(pdu, format);
} }
/** /**
src/com/android/messaging/util/DebugUtils.java
+7 -2
View File
@@ -291,9 +291,10 @@ public class DebugUtils {
dis = new DataInputStream(fis); dis = new DataInputStream(fis);
// SMS dump // SMS dump
String format = null;
final int chars = dis.readInt(); final int chars = dis.readInt();
if (chars > 0) { if (chars > 0) {
final String format = dis.readUTF(); format = dis.readUTF();
} }
final int count = dis.readInt(); final int count = dis.readInt();
final SmsMessage[] messagesTemp = new SmsMessage[count]; final SmsMessage[] messagesTemp = new SmsMessage[count];
@@ -301,7 +302,11 @@ public class DebugUtils {
final int length = dis.readInt(); final int length = dis.readInt();
final byte[] pdu = new byte[length]; final byte[] pdu = new byte[length];
dis.read(pdu, 0, length); dis.read(pdu, 0, length);
messagesTemp[i] = SmsMessage.createFromPdu(pdu); if (format == null) {
messagesTemp[i] = SmsMessage.createFromPdu(pdu);
} else {
messagesTemp[i] = SmsMessage.createFromPdu(pdu, format);
}
} }
messages = messagesTemp; messages = messagesTemp;
} catch (final FileNotFoundException e) { } catch (final FileNotFoundException e) {