aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
diff options
context:
space:
mode:
authorArne Coucheron <arco68@gmail.com>2016-12-21 14:48:49 +0100
committerZhao Wei Liew <zhaoweiliew@gmail.com>2016-12-22 19:35:06 -0800
commit04d40552fd4eabfa449349288b004ce73314d979 (patch)
treebdec1df129427504486f3f6f6ef0509ab448fa03 /src/com/cyanogenmod/filemanager/activities/PickerActivity.java
parent11826416cafe5392cf1c17de85c010da4bce91d9 (diff)
downloadandroid_packages_apps_CMFileManager-04d40552fd4eabfa449349288b004ce73314d979.tar.gz
android_packages_apps_CMFileManager-04d40552fd4eabfa449349288b004ce73314d979.tar.bz2
android_packages_apps_CMFileManager-04d40552fd4eabfa449349288b004ce73314d979.zip
Revert "cmfm: Use FileProvider for serving files"
Incomplete so things are still very much broken. We'll force SDK to version 23 instead for now, so at least we have a fully working file manager. This reverts commit 578f0a0ed7870b5a8ed28c7c0198a798b389a682. Change-Id: I612507d75d3e45ba091d43ac2c5bf1f9dbe53fb5
Diffstat (limited to 'src/com/cyanogenmod/filemanager/activities/PickerActivity.java')
-rw-r--r--src/com/cyanogenmod/filemanager/activities/PickerActivity.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/cyanogenmod/filemanager/activities/PickerActivity.java b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
index 17707a66..ba5fa53a 100644
--- a/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
+++ b/src/com/cyanogenmod/filemanager/activities/PickerActivity.java
@@ -34,7 +34,6 @@ import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.os.storage.StorageVolume;
-import android.support.v4.content.FileProvider;
import android.text.TextUtils;
import android.util.DisplayMetrics;
import android.util.Log;
@@ -467,8 +466,7 @@ public class PickerActivity extends Activity
if (getIntent().getType() != null) {
intent.setType(getIntent().getType());
}
- intent.setData(FileProvider.getUriForFile(this,
- "com.cyanogenmod.filemanager.providers.file", src));
+ intent.setData(Uri.fromFile(src));
intent.putExtras(extras);
intent.setComponent(CROP_COMPONENT);
try {
@@ -574,8 +572,7 @@ public class PickerActivity extends Activity
// Try to find the preferred uri scheme
Uri result = MediaHelper.fileToContentUri(context, src);
if (result == null) {
- result = FileProvider.getUriForFile(context,
- "com.cyanogenmod.filemanager.providers.file", src);
+ result = Uri.fromFile(src);
}
if (Intent.ACTION_PICK.equals(intent.getAction()) && intent.getData() != null) {