commit a25e716645f2ee1a90bf46281e263246baa0e8c8
author Tom Taylor <tomtaylor@google.com> Mon May 01 18:21:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 01 18:21:56 2017 +0000
tree f8f8c13ecbb9414f686c186b8503e166590d7b39
parent 54abffd219af589d6e9611e2647ee18b67c0b597
parent 7ffdc9c33327cd0a48958631b6293a8ed58ab19e

Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev
am: 7ffdc9c333

Change-Id: Ibfe8a044ae6dd12fbd4c204150fa410fa6867220

src/com/android/messaging/mmslib/pdu/PduPersister.java

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 @@
                 }
                 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 @@
         // 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);
         }
     }