diff options
author | Marco Nelissen <marcone@google.com> | 2015-07-29 16:11:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-29 16:11:16 +0000 |
commit | ffd910653896174bba59685d1aa6ef99ffe65ebb (patch) | |
tree | e3cb99bdc43b9c08405c33f87ff8235064269dba | |
parent | 1662f5e0e3254cb28c600dcf747133419a7a88f1 (diff) | |
parent | 2c86de8ad3e8724d2c1d0325606188ecf69e3128 (diff) | |
download | android_packages_providers_MediaProvider-ffd910653896174bba59685d1aa6ef99ffe65ebb.tar.gz android_packages_providers_MediaProvider-ffd910653896174bba59685d1aa6ef99ffe65ebb.tar.bz2 android_packages_providers_MediaProvider-ffd910653896174bba59685d1aa6ef99ffe65ebb.zip |
am 2c86de8a: Merge "Throw correct exception for null paths" into mnc-dev
* commit '2c86de8ad3e8724d2c1d0325606188ecf69e3128':
Throw correct exception for null paths
-rwxr-xr-x | src/com/android/providers/media/MediaProvider.java | 6 |
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); } |