commit 89734e19f45f19a5c4eddfe02bde901bdecd5188
author Marco Nelissen <marcone@google.com> Fri Sep 30 15:21:35 2016 -0700
committer Marco Nelissen <marcone@google.com> Fri Sep 30 15:21:35 2016 -0700
tree 3c2e9740802cadf1882d139421d3d7d5bd7c1556
parent d89181d1feb8c0fc198424d77c8275e7cab7b97c

Throw correct exception for null path insert

insert should return IllegalArgumentException instead of NullPointerException

Bug: 31861145
Change-Id: I12005c9ca4ebd4ab35cebdc80352c1696f4e57d1

src/com/android/providers/media/MediaProvider.java

diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index aa8cd88..e181e59 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -3214,7 +3214,7 @@
                 format = MediaFile.getFormatCode(path, mimeType);
             }
         }
-        if (path.endsWith("/")) {
+        if (path != null && path.endsWith("/")) {
             Log.e(TAG, "directory has trailing slash: " + path);
             return 0;
         }