commit 2e368f6d87eb82691f855e93f85599b75b489731
author Ben Murdoch <benm@google.com> Thu Jul 24 19:42:30 2014 +0100
committer Ben Murdoch <benm@google.com> Thu Jul 24 18:44:14 2014 +0000
tree cc4b1b55483c8072080a1c546b8f6c89a892ec14
parent 99888374e72a9b7099bdb1320d6cc69f454520e2

Do not crash on opening a directory.

Bug: 16542465
Change-Id: Ic062defe3ba4d69020968cb2c85bf9dc52268ec8

src/com/android/htmlviewer/FileContentProvider.java

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