From 299942002b17f792e6e4f6b3f6972f62b8b136ae Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Wed, 9 Jan 2013 09:46:54 -0800
Subject: [PATCH] Fix media scan NPE

b/7966288

Change-Id: I066bc9f00bccf070332d87d6f1bf3d6054b31136
---
 media/java/android/media/MediaScanner.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index fbbcb0a323e58..7768a61968b56 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -958,7 +958,9 @@ public class MediaScanner
                 // 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);