commit b102fb8ed5acdfa5f47e60b7d9fef7b5d74bd9fd
author Marco Nelissen <marcone@google.com> Wed Jan 09 09:49:25 2013 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 09 09:50:13 2013 -0800
tree ae7892b0a4b1b9fb495c2ffbe0ffaa86e83fa3f6
parent 64a0f914a137ae05f8f9719b6f27c4c81eee3a0f
parent 299942002b17f792e6e4f6b3f6972f62b8b136ae

Merge "Fix media scan NPE"

media/java/android/media/MediaScanner.java

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index fbbcb0a..7768a61 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -958,7 +958,9 @@
                 // If the rowId of the inserted file is needed, it gets inserted immediately,
                 // bypassing the bulk inserter.
                 if (inserter == null || needToSetSettings) {
-                    inserter.flushAll();
+                    if (inserter != null) {
+                        inserter.flushAll();
+                    }
                     result = mMediaProvider.insert(tableUri, values);
                 } else if (entry.mFormat == MtpConstants.FORMAT_ASSOCIATION) {
                     inserter.insertwithPriority(tableUri, values);