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

Commit bda54483 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [5532243, 5532244, 5532245, 5532246, 5532247, 5532826,... 

Merge cherrypicks of [5532243, 5532244, 5532245, 5532246, 5532247, 5532826, 5530552, 5532902, 5530553, 5531520, 5532903, 5530554, 5529581, 5529582, 5531521, 5532979, 5532999, 5532248, 5531522, 5531523, 5531524, 5531525, 5531526, 5529583, 5529584, 5529585, 5529586, 5531351, 5529632, 5530506, 5530507, 5532980, 5533000] into pi-qpr1-release

Change-Id: Idc53a74f482ef8626277cad0f474ea8ba0190428
parents f1ce5862 66abad90

src/com/android/contacts/util/ContactPhotoUtils.java

+18 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
package com.android.contacts.util;



import android.content.ClipData;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;

import android.graphics.Bitmap;
@@ -26,11 +27,9 @@ import android.net.Uri; 
import android.provider.MediaStore;

import android.support.v4.content.FileProvider;

import android.util.Log;



import com.android.contacts.R;



import com.google.common.io.Closeables;



import java.io.ByteArrayOutputStream;

import java.io.File;

import java.io.FileNotFoundException;
@@ -148,7 +147,7 @@ public class ContactPhotoUtils { 
     */

    public static boolean savePhotoFromUriToUri(Context context, Uri inputUri, Uri outputUri,

            boolean deleteAfterSave) {

        if (inputUri == null || outputUri == null) {

        if (inputUri == null || outputUri == null || isFilePathAndNotStorage(inputUri)) {

            return false;

        }

        try (FileOutputStream outputStream = context.getContentResolver()
@@ -175,4 +174,20 @@ public class ContactPhotoUtils { 
        }

        return true;

    }



    /**

     * Returns {@code true} if the {@code inputUri} is a FILE scheme and it does not point to

     * the storage directory.

     */

    private static boolean isFilePathAndNotStorage(Uri inputUri) {

        if (ContentResolver.SCHEME_FILE.equals(inputUri.getScheme())) {

            try {

                File file = new File(inputUri.getPath()).getCanonicalFile();

                return !file.getCanonicalPath().startsWith("/storage/");

            } catch (IOException e) {

                return false;

            }

        }

        return false;

    }

}

tests/src/com/android/contacts/util/ContactPhotoUtilsTest.java

0 → 100644
+49 −0
Original line number Diff line number Diff line 
package com.android.contacts.util;



import android.net.Uri;

import android.test.AndroidTestCase;

import android.test.suitebuilder.annotation.SmallTest;



/**

 * Test cases for {@link ContactPhotoUtils}.

 *

 * adb shell am instrument -w -e class com.android.contacts.util.ContactPhotoUtilsTest \

 *   com.android.contacts.tests/android.test.InstrumentationTestRunner

 */

@SmallTest

public class ContactPhotoUtilsTest extends AndroidTestCase {



  private Uri tempUri;



  @Override

  protected void setUp() throws Exception {

    tempUri = ContactPhotoUtils.generateTempImageUri(getContext());

  }



  protected void tearDown() throws Exception {

    getContext().getContentResolver().delete(tempUri, null, null);

  }



  public void testFileUriDataPathFails() {

    String filePath =

        "file:///data/data/com.android.contacts/shared_prefs/com.android.contacts.xml";



    assertFalse(

        ContactPhotoUtils.savePhotoFromUriToUri(getContext(), Uri.parse(filePath), tempUri, false));

  }



  public void testFileUriCanonicalDataPathFails() {

    String filePath =

        "file:///storage/../data/data/com.android.contacts/shared_prefs/com.android.contacts.xml";



    assertFalse(

        ContactPhotoUtils.savePhotoFromUriToUri(getContext(), Uri.parse(filePath), tempUri, false));

  }



  public void testContentUriInternalPasses() {

    Uri internal = ContactPhotoUtils.generateTempImageUri(getContext());



    assertTrue(

        ContactPhotoUtils.savePhotoFromUriToUri(getContext(), internal, tempUri, true));

  }

}