Commit a06bf2fc authored Mar 17, 2016 by Bartosz Bialek Committed by android-build-merger Mar 17, 2016

Merge "Do not scan a file which cannot be read" am: 258baa35 am: 3fc27c34

am: 6bca637e

* commit '6bca637e':
  Do not scan a file which cannot be read

media/java/android/media/MediaScanner.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1392,7 +1392,7 @@ public class MediaScanner implements AutoCloseable {
		prescan(path, true);

		File file = new File(path);
		if (!file.exists()) {
		if (!file.exists() \|\| !file.canRead()) {
		return null;
		}