diff options
author | Tom Taylor <tomtaylor@google.com> | 2017-05-01 18:29:30 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-01 18:29:30 +0000 |
commit | 33e6be1db8bacd86342ad65e68669d8117dcef02 (patch) | |
tree | f8f8c13ecbb9414f686c186b8503e166590d7b39 | |
parent | 7eb0aa9da9e9641a884149a61d863e7411ebe395 (diff) | |
parent | a25e716645f2ee1a90bf46281e263246baa0e8c8 (diff) | |
download | Messaging-33e6be1db8bacd86342ad65e68669d8117dcef02.tar.gz |
Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev am: 7ffdc9c333
am: a25e716645
Change-Id: I8f77c67dfc3002b2b6d5e20049e0cf715f6ff81e
-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); } } |