diff options
author | John Reck <jreck@android.com> | 2012-08-31 10:21:01 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-31 10:21:01 -0700 |
commit | e688d4d402ed98a6c82a1706c16894e6d59f458d (patch) | |
tree | 43d93413855293d0953d873e898e6bb56fa6588b | |
parent | 958d752787bb70b2991b725729c129d0ecb09d77 (diff) | |
parent | 4222180dd0d4f3e1f094bf72a78d6d88a876bac8 (diff) | |
download | HTMLViewer-android-4.2.1_r1.tar.gz |
am 4222180d: Merge "HTMLViewer could not open UTF-8 encoded file path."android-sdk-support_r11android-cts-4.2_r2android-cts-4.2_r1android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1android-4.2_r1android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1tools_r22.2tools_r22jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devjb-mr1.1-releasejb-mr1.1-dev-plus-aospjb-mr1.1-devjb-mr1-releasejb-mr1-dev-plus-aospjb-mr1-dev
* commit '4222180dd0d4f3e1f094bf72a78d6d88a876bac8':
HTMLViewer could not open UTF-8 encoded file path.
-rw-r--r-- | src/com/android/htmlviewer/FileContentProvider.java | 3 |
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); } |