diff options
author | Tom Taylor <tomtaylor@google.com> | 2017-05-01 18:09:08 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-01 18:09:08 +0000 |
commit | 7ffdc9c33327cd0a48958631b6293a8ed58ab19e (patch) | |
tree | f8f8c13ecbb9414f686c186b8503e166590d7b39 | |
parent | 5aa1187f869909273f86a4636511194f460fa4ce (diff) | |
parent | db45a19fe5507599562e2b1f4f23e979311395f9 (diff) | |
download | Messaging-7ffdc9c33327cd0a48958631b6293a8ed58ab19e.tar.gz |
Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev
-rw-r--r-- | src/com/android/messaging/mmslib/pdu/PduPersister.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/messaging/mmslib/pdu/PduPersister.java b/src/com/android/messaging/mmslib/pdu/PduPersister.java index 22578b1..5c54e7b 100644 --- a/src/com/android/messaging/mmslib/pdu/PduPersister.java +++ b/src/com/android/messaging/mmslib/pdu/PduPersister.java @@ -918,7 +918,7 @@ public class PduPersister { } if (data == null) { dataUri = part.getDataUri(); - if ((dataUri == null) || (dataUri == uri)) { + if ((dataUri == null) || (dataUri.equals(uri))) { Log.w(TAG, "Can't find data for this part."); return; } @@ -1202,7 +1202,7 @@ public class PduPersister { // 1. New binary data supplied or // 2. The Uri of the part is different from the current one. if ((part.getData() != null) - || (uri != part.getDataUri())) { + || (!uri.equals(part.getDataUri()))) { persistData(part, uri, contentType, preOpenedFiles); } } |