From 2e368f6d87eb82691f855e93f85599b75b489731 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 24 Jul 2014 19:42:30 +0100
Subject: Do not crash on opening a directory.

Bug: 16542465
Change-Id: Ic062defe3ba4d69020968cb2c85bf9dc52268ec8
---
 src/com/android/htmlviewer/FileContentProvider.java | 7 +++++--
 1 file 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
-- 
cgit v1.2.3