Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b8312f3 authored by Tom Taylor's avatar Tom Taylor Committed by android-build-merger
Browse files

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

am: 36f06a79

Change-Id: I104297007f2a11ee595da7a7a1cc468be83df4ac
parents 56cfe873 36f06a79

src/java/com/google/android/mms/pdu/PduPersister.java

+2 −2
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ public class PduPersister { 
                os = mContentResolver.openOutputStream(uri);

                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;

                    }
@@ -1136,7 +1136,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);

        }

    }