LineageOS/android_packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev

Browse Source 
am: 7ffdc9c333

Change-Id: Ibfe8a044ae6dd12fbd4c204150fa410fa6867220
This commit is contained in:
Tom Taylor
2017-05-01 18:21:56 +00:00
committed by android-build-merger
parent 54abffd219 7ffdc9c333
commit a25e716645
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/messaging/mmslib/pdu/PduPersister.java
View File

@@ -918,7 +918,7 @@ public class PduPersister {
} }
if (data == null) { if (data == null) {
dataUri = part.getDataUri(); dataUri = part.getDataUri();
if ((dataUri == null) || (dataUri == uri)) { if ((dataUri == null) || (dataUri.equals(uri))) {
Log.w(TAG, "Can't find data for this part."); Log.w(TAG, "Can't find data for this part.");
return; return;
} }
@@ -1202,7 +1202,7 @@ public class PduPersister {
// 1. New binary data supplied or // 1. New binary data supplied or
// 2. The Uri of the part is different from the current one. // 2. The Uri of the part is different from the current one.
if ((part.getData() != null) if ((part.getData() != null)
|| (uri != part.getDataUri())) { || (!uri.equals(part.getDataUri()))) {
persistData(part, uri, contentType, preOpenedFiles); persistData(part, uri, contentType, preOpenedFiles);
} }
} }