Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix media scan NPE"

Browse Source
This commit is contained in:
Marco Nelissen
2013-01-09 09:49:25 -08:00
committed by Android (Google) Code Review
parent 64a0f914a1 299942002b
commit b102fb8ed5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/java/android/media/MediaScanner.java
View File

@@ -958,7 +958,9 @@ public class MediaScanner
// If the rowId of the inserted file is needed, it gets inserted immediately, // If the rowId of the inserted file is needed, it gets inserted immediately,
// bypassing the bulk inserter. // bypassing the bulk inserter.
if (inserter == null || needToSetSettings) { if (inserter == null || needToSetSettings) {
inserter.flushAll(); if (inserter != null) {
inserter.flushAll();
}
result = mMediaProvider.insert(tableUri, values); result = mMediaProvider.insert(tableUri, values);
} else if (entry.mFormat == MtpConstants.FORMAT_ASSOCIATION) { } else if (entry.mFormat == MtpConstants.FORMAT_ASSOCIATION) {
inserter.insertwithPriority(tableUri, values); inserter.insertwithPriority(tableUri, values);