am ce23a0b3: am ffd91065: am 2c86de8a: Merge "Throw correct exception for null paths" into mnc-dev

* commit 'ce23a0b311fa12ead909e98b5803fc0df2768a2a':
  Throw correct exception for null paths

1 files changed, 5 insertions, 1 deletions

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 2df6c1f4..6c160763 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);
                     }