am 4222180d: Merge "HTMLViewer could not open UTF-8 encoded file path."
* commit '4222180dd0d4f3e1f094bf72a78d6d88a876bac8':
HTMLViewer could not open UTF-8 encoded file path.
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 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 @@
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);
}