From db45a19fe5507599562e2b1f4f23e979311395f9 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 27 Apr 2017 10:57:28 -0700 Subject: 37544704 PduPersister is not doing a safe Uri comparison * The PduPersister had some code where it checked uris for equality, but didn't use the safe .equals method. Test: manual test of sending and receiving mms's. Bug: 37544704 Change-Id: I6dfd037068b4eff04c34cd9d41760e36e11915d6 --- src/com/android/messaging/mmslib/pdu/PduPersister.java | 4 ++-- 1 file 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); } } -- cgit v1.2.3