From 4ecfce6f6fa4e0d32e9a57222ab0f4b91d2845df Mon Sep 17 00:00:00 2001
From: Marco Nelissen <marcone@google.com>
Date: Mon, 3 Dec 2012 15:11:15 -0800
Subject: [PATCH] Fix default ring/alarm/notification insertion

Before directly inserting an item that is the default ringtone, alarm or
notification, flush the MediaInserter, since a parent of the inserted item
might not have been flushed yet.

b/7650557

Change-Id: Icdd25bd9cac8b43a75e63318b936246562744c59
---
 media/java/android/media/MediaScanner.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 959bf0aed3953..423a1096509fb 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -958,6 +958,7 @@ 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();
                     result = mMediaProvider.insert(tableUri, values);
                 } else if (entry.mFormat == MtpConstants.FORMAT_ASSOCIATION) {
                     inserter.insertwithPriority(tableUri, values);