summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2014-07-28 12:14:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-28 12:14:08 +0000
commitf611ca4b9580c624b91d006920dd4485dde30250 (patch)
treecc4b1b55483c8072080a1c546b8f6c89a892ec14
parent2c462a7367486aa79c99e2475398d27261825580 (diff)
parent2e368f6d87eb82691f855e93f85599b75b489731 (diff)
downloadandroid_packages_apps_HTMLViewer-f611ca4b9580c624b91d006920dd4485dde30250.tar.gz
android_packages_apps_HTMLViewer-f611ca4b9580c624b91d006920dd4485dde30250.tar.bz2
android_packages_apps_HTMLViewer-f611ca4b9580c624b91d006920dd4485dde30250.zip
am 2e368f6d: Do not crash on opening a directory.
* commit '2e368f6d87eb82691f855e93f85599b75b489731': Do not crash on opening a directory.
-rw-r--r--src/com/android/htmlviewer/FileContentProvider.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/htmlviewer/FileContentProvider.java b/src/com/android/htmlviewer/FileContentProvider.java
index 6ce0623..4cf16a6 100644
--- a/src/com/android/htmlviewer/FileContentProvider.java
+++ b/src/com/android/htmlviewer/FileContentProvider.java
@@ -57,8 +57,11 @@ public class FileContentProvider extends ContentProvider {
throw new FileNotFoundException("Bad mode for " + uri + ": " + mode);
}
String filename = uri.getPath();
- return ParcelFileDescriptor.open(new File(filename),
- ParcelFileDescriptor.MODE_READ_ONLY);
+ File f = new File(filename);
+ if (f.isDirectory()) {
+ return null;
+ }
+ return ParcelFileDescriptor.open(f, ParcelFileDescriptor.MODE_READ_ONLY);
}
@Override