From dc6c5749a9bfc3a45b6aaa54bcac37eb18cfbe0d Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Mon, 27 Jul 2015 14:57:18 -0700 Subject: Throw correct exception for null paths Bug: 22519119 Change-Id: I8aff294201dfd8ec46ff3d30e4ceecea1346f29b --- src/com/android/providers/media/MediaProvider.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java index 39ed0d8b..324a15b6 100755 --- a/src/com/android/providers/media/MediaProvider.java +++ b/src/com/android/providers/media/MediaProvider.java @@ -4627,7 +4627,11 @@ public class MediaProvider extends ContentProvider { throw new FileNotFoundException("No entry for " + uri); case 1: if (cursor.moveToFirst()) { - return new File(cursor.getString(0)); + String data = cursor.getString(0); + if (data == null) { + throw new FileNotFoundException("Null path for " + uri); + } + return new File(data); } else { throw new FileNotFoundException("Unable to read entry for " + uri); } -- cgit v1.2.3