diff options
author | Tom Taylor <tomtaylor@google.com> | 2016-12-07 02:53:54 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-12-07 02:53:54 +0000 |
commit | 838049884f892ca7fe9f76ddce503cd388e6898d (patch) | |
tree | 7691c59f08159384908a2e20ff99a2fe8b31499b | |
parent | 49b092f60228f1282cfc2c75d46cd0c2ae7cd63e (diff) | |
parent | 47feeee8ee0c4c85e5ea38950e3f7f70987b4b20 (diff) | |
download | android_packages_apps_Messaging-838049884f892ca7fe9f76ddce503cd388e6898d.tar.gz android_packages_apps_Messaging-838049884f892ca7fe9f76ddce503cd388e6898d.tar.bz2 android_packages_apps_Messaging-838049884f892ca7fe9f76ddce503cd388e6898d.zip |
resolve merge conflicts of eafd58a to nyc-dev am: a43c5c5f18 am: 4d220d4777
am: 47feeee8ee
Change-Id: Iec5af613a115c5120bbfd3e99d6e3503d0a05b36
-rw-r--r-- | src/com/android/messaging/ui/mediapicker/DocumentImagePicker.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/messaging/ui/mediapicker/DocumentImagePicker.java b/src/com/android/messaging/ui/mediapicker/DocumentImagePicker.java index 2c36752..bb267da 100644 --- a/src/com/android/messaging/ui/mediapicker/DocumentImagePicker.java +++ b/src/com/android/messaging/ui/mediapicker/DocumentImagePicker.java @@ -24,6 +24,8 @@ import android.os.Bundle; import com.android.messaging.Factory; import com.android.messaging.datamodel.data.PendingAttachmentData; import com.android.messaging.ui.UIIntents; +import com.android.messaging.util.LogUtil; +import com.android.messaging.util.FileUtil; import com.android.messaging.util.ImageUtils; import com.android.messaging.util.SafeAsyncTask; @@ -111,12 +113,23 @@ public class DocumentImagePicker { new SafeAsyncTask<Void, Void, String>() { @Override protected String doInBackgroundTimed(final Void... params) { + if (FileUtil.isInPrivateDir(documentUri)) { + // hacker sending private app data. Bail out + if (LogUtil.isLoggable(LogUtil.BUGLE_TAG, LogUtil.ERROR)) { + LogUtil.e(LogUtil.BUGLE_TAG, "Aborting attach of private app data (" + + documentUri + ")"); + } + return null; + } return ImageUtils.getContentType( Factory.get().getApplicationContext().getContentResolver(), documentUri); } @Override protected void onPostExecute(final String contentType) { + if (contentType == null) { + return; // bad uri on input + } // Ask the listener to create a temporary placeholder item to show the progress. final PendingAttachmentData pendingItem = PendingAttachmentData.createPendingAttachmentData(contentType, |