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

am 474b0f29: Merge change 7686 into donut

Browse Source 
Merge commit '474b0f2941430b97b4f24f16f7173e5249ccc8f2'

* commit '474b0f2941430b97b4f24f16f7173e5249ccc8f2':
  MediaScanner: Add check for null object in empty title handling code.
This commit is contained in:
Android (Google) Code Review
2009-07-17 15:42:59 -07:00
committed by Android Git Automerger
parent bc9b80750a 474b0f2941
commit ab6ee15f8c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -663,7 +663,7 @@ public class MediaScanner
ContentValues values = toValues();
String title = values.getAsString(MediaStore.MediaColumns.TITLE);
if (TextUtils.isEmpty(title.trim())) {
if (title == null || TextUtils.isEmpty(title.trim())) {
title = values.getAsString(MediaStore.MediaColumns.DATA);
// extract file name after last slash
int lastSlash = title.lastIndexOf('/');