summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-07-29 17:30:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-29 17:30:54 +0000
commitce23a0b311fa12ead909e98b5803fc0df2768a2a (patch)
tree6bf0527439fcc60e222a1f5a63acc0cb845e728b
parentb004c90e510d1e2c9c9a9368ee0b6039d2be7426 (diff)
parentffd910653896174bba59685d1aa6ef99ffe65ebb (diff)
downloadandroid_packages_providers_MediaProvider-ce23a0b311fa12ead909e98b5803fc0df2768a2a.tar.gz
android_packages_providers_MediaProvider-ce23a0b311fa12ead909e98b5803fc0df2768a2a.tar.bz2
android_packages_providers_MediaProvider-ce23a0b311fa12ead909e98b5803fc0df2768a2a.zip
am ffd91065: am 2c86de8a: Merge "Throw correct exception for null paths" into mnc-dev
* commit 'ffd910653896174bba59685d1aa6ef99ffe65ebb': Throw correct exception for null paths
-rwxr-xr-xsrc/com/android/providers/media/MediaProvider.java6
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);
}