summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsyphyr <syphyr@gmail.com>2018-08-07 03:15:02 +0200
committersyphyr <syphyr@gmail.com>2018-08-07 21:33:35 +0200
commitd21b478314fca67038248936959e8a380ba1bae4 (patch)
tree7f8a9cb1bf85b1d55b45de0bf2770bc030b8cb80
parent50457565614a61d76dd3f625595d3f3ae87d4b6c (diff)
downloadandroid_packages_apps_Messaging-d21b478314fca67038248936959e8a380ba1bae4.tar.gz
android_packages_apps_Messaging-d21b478314fca67038248936959e8a380ba1bae4.tar.bz2
android_packages_apps_Messaging-d21b478314fca67038248936959e8a380ba1bae4.zip
Revert "Messaging: Request external storage permission before handling shared files"
This reverts commit 53b0ba33a29d152c283f56b24655e708aea50558. Change-Id: I615dd0286e072e21fcd3623c27138c2cc841d820
-rw-r--r--src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java
index 24d8329..d62a154 100644
--- a/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java
+++ b/src/com/android/messaging/ui/conversationlist/ShareIntentActivity.java
@@ -16,7 +16,6 @@
package com.android.messaging.ui.conversationlist;
-import android.Manifest;
import android.app.Fragment;
import android.content.ContentResolver;
import android.content.Intent;
@@ -36,9 +35,7 @@ import com.android.messaging.util.ContentType;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.MediaMetadataRetrieverWrapper;
import com.android.messaging.util.FileUtil;
-import com.android.messaging.util.OsUtil;
import com.android.messaging.util.UiUtils;
-import com.android.messaging.util.UriUtil;
import java.io.IOException;
import java.util.ArrayList;
@@ -81,10 +78,6 @@ public class ShareIntentActivity extends BaseBugleActivity implements
final String action = intent.getAction();
if (Intent.ACTION_SEND.equals(action)) {
final Uri contentUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
- if (UriUtil.isFileUri(contentUri) && !OsUtil.hasStoragePermission()) {
- requestPermissions(
- new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, 0);
- }
final String contentType = extractContentType(contentUri, intent.getType());
if (LogUtil.isLoggable(LogUtil.BUGLE_TAG, LogUtil.DEBUG)) {
LogUtil.d(LogUtil.BUGLE_TAG, String.format(
@@ -125,10 +118,6 @@ public class ShareIntentActivity extends BaseBugleActivity implements
if (imageUris != null && imageUris.size() > 0) {
mDraftMessage = MessageData.createSharedMessage(null);
for (final Uri imageUri : imageUris) {
- if (UriUtil.isFileUri(imageUri) && !OsUtil.hasStoragePermission()) {
- requestPermissions(
- new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, 0);
- }
final String actualContentType = extractContentType(imageUri, contentType);
addSharedImagePartToDraft(actualContentType, imageUri);
}