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

Merge change 7686 into donut

Browse Source 
* changes:
  MediaScanner: Add check for null object in empty title handling code.
This commit is contained in:
Android (Google) Code Review
2009-07-17 10:14:32 -07:00
parent 54f0910138 bdc0e82f9c
commit 474b0f2941
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

@@ -657,7 +657,7 @@ public class MediaScanner
ContentValues values = toValues(); ContentValues values = toValues();
String title = values.getAsString(MediaStore.MediaColumns.TITLE); 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); title = values.getAsString(MediaStore.MediaColumns.DATA);
// extract file name after last slash // extract file name after last slash
int lastSlash = title.lastIndexOf('/'); int lastSlash = title.lastIndexOf('/');