From 6124cddc629eb0a13e9d9e30e0613614d17950c5 Mon Sep 17 00:00:00 2001
From: Bartosz Bialek <bartosz.bialek@sonymobile.com>
Date: Wed, 8 Oct 2014 13:31:34 +0200
Subject: [PATCH] Do not scan a file which cannot be read

When the media scanner is invoked to scan a file which it cannot access
(e.g. one in the app-private directories) the related database entry
will be created anyway, which doesn't make sense. This results in having
broken entries showed up in e.g. Album app.

This fix is to prevent scanning files which are inaccessible.

Change-Id: I5b4909bf709c82d66e891f3e7f6890febc90c6eb
---
 media/java/android/media/MediaScanner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 9ea672287d88c..f9465edcc839f 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -1355,7 +1355,7 @@ public class MediaScanner
             prescan(path, true);
 
             File file = new File(path);
-            if (!file.exists()) {
+            if (!file.exists() || !file.canRead()) {
                 return null;
             }