Do not crash on opening a directory.
Bug: 16542465
Change-Id: Ic062defe3ba4d69020968cb2c85bf9dc52268ec8
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 @@
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