am 2e368f6: Do not crash on opening a directory.

* commit '2e368f6d87eb82691f855e93f85599b75b489731': Do not crash on opening a directory.
aosp-mirror · Jul 28, 2014 · f611ca4 · f611ca4
2 parents 2c462a7 + 2e368f6
commit f611ca4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/com/android/htmlviewer/FileContentProvider.java b/src/com/android/htmlviewer/FileContentProvider.java
@@ -57,8 +57,11 @@ public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundEx
             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