summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@android.com>2012-08-31 09:16:28 -0700
committerandroid code review <noreply-gerritcodereview@google.com>2012-08-31 09:16:29 -0700
commit4222180dd0d4f3e1f094bf72a78d6d88a876bac8 (patch)
tree60312e6fdc6a5a0f58e728ff70c9aa85095371fa
parent78afabcb89cc9b94bd0bc0b9eebe317e7c2ba959 (diff)
parent0207e4ae37eb72b77d79d6ebb2e1f2d612f33547 (diff)
downloadandroid_packages_apps_HTMLViewer-4222180dd0d4f3e1f094bf72a78d6d88a876bac8.tar.gz
android_packages_apps_HTMLViewer-4222180dd0d4f3e1f094bf72a78d6d88a876bac8.tar.bz2
android_packages_apps_HTMLViewer-4222180dd0d4f3e1f094bf72a78d6d88a876bac8.zip
Merge "HTMLViewer could not open UTF-8 encoded file path."
-rw-r--r--src/com/android/htmlviewer/FileContentProvider.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/htmlviewer/FileContentProvider.java b/src/com/android/htmlviewer/FileContentProvider.java
index 2583b70..2f417a1 100644
--- a/src/com/android/htmlviewer/FileContentProvider.java
+++ b/src/com/android/htmlviewer/FileContentProvider.java
@@ -38,7 +38,6 @@ public class FileContentProvider extends ContentProvider {
public static final String BASE_URI =
"content://com.android.htmlfileprovider";
- public static final int BASE_URI_LEN = BASE_URI.length();
@Override
public String getType(Uri uri) {
@@ -57,7 +56,7 @@ public class FileContentProvider extends ContentProvider {
if (!"r".equals(mode)) {
throw new FileNotFoundException("Bad mode for " + uri + ": " + mode);
}
- String filename = uri.toString().substring(BASE_URI_LEN);
+ String filename = uri.getPath();
return ParcelFileDescriptor.open(new File(filename),
ParcelFileDescriptor.MODE_READ_ONLY);
}