am 4222180d: Merge "HTMLViewer could not open UTF-8 encoded file path."cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingcm-10.1

* commit '4222180dd0d4f3e1f094bf72a78d6d88a876bac8':
  HTMLViewer could not open UTF-8 encoded file path.

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);
     }