commit 51a8342f5f9e11bc3593c0543ba67aad2435bee1
author mtk33169 <vineet.jhunjhunwala@mediatek.com> Mon Nov 12 19:52:47 2018 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 12 19:52:47 2018 -0800
tree 103c4e5c3e51fe869cfc3179096cb611455cb5cc
parent 1fa1b991f0783f03d61ad1d5ac300cfd81790a07
parent a10effa6d4cc8b4bac4515713d691e799c8d8ffa

Merge "The JE about "android.process.media" will pop up when you eject the SD card after you set SD as internel phone storage" am: 83269acba7
am: a10effa6d4

Change-Id: Ibae7dcc2c76062b5a64a6d0825abafc8fa015eea

media/java/android/media/MediaScanner.java

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 8207a54..091c659 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -1634,7 +1634,7 @@
             selectionArgs = new String[] { path };
             c = mMediaProvider.query(mFilesUriNoNotify, FILES_PRESCAN_PROJECTION,
                     where, selectionArgs, null, null);
-            if (c.moveToFirst()) {
+            if (c != null && c.moveToFirst()) {
                 long rowId = c.getLong(FILES_PRESCAN_ID_COLUMN_INDEX);
                 int format = c.getInt(FILES_PRESCAN_FORMAT_COLUMN_INDEX);
                 long lastModified = c.getLong(FILES_PRESCAN_DATE_MODIFIED_COLUMN_INDEX);