commit 11ca19dc41602c091615141545a307c9d4b7f186
author Jeff Sharkey <jsharkey@android.com> Thu Oct 17 10:51:55 2013 -0700
committer Jeff Sharkey <jsharkey@android.com> Thu Oct 17 10:51:55 2013 -0700
tree 8cbb69acaa94baf57254f8a56900a92b4fe0b29a
parent 5d36def3fe5c6a7ec3d04e2f555c47bb4a8babed

Avoid NPE when checking for empty volume.

Bug: 11175082
Change-Id: Ie35da00babeabaaf39d3afb2da53b39e80bddaac

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

diff --git a/src/com/android/providers/media/MediaDocumentsProvider.java b/src/com/android/providers/media/MediaDocumentsProvider.java
index cb8cc2f..a887a83 100644
--- a/src/com/android/providers/media/MediaDocumentsProvider.java
+++ b/src/com/android/providers/media/MediaDocumentsProvider.java
@@ -476,7 +476,7 @@
         try {
             cursor = resolver.query(uri, new String[] {
                     BaseColumns._ID }, null, null, null);
-            return (cursor.getCount() == 0);
+            return (cursor == null) || (cursor.getCount() == 0);
         } finally {
             IoUtils.closeQuietly(cursor);
             Binder.restoreCallingIdentity(token);