drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MediaScanner: No longer delete playlist files that have no valid entries"

Browse Source
This commit is contained in:
Mike Lockwood
2010-12-13 12:39:28 -08:00
committed by Android (Google) Code Review
parent 87212c1979 eb46d0601e
commit 5bd7d9347b
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1494,17 +1494,6 @@ public class MediaScanner
} else if (fileType == MediaFile.FILE_TYPE_WPL) { } else if (fileType == MediaFile.FILE_TYPE_WPL) {
processWplPlayList(path, playListDirectory, membersUri); processWplPlayList(path, playListDirectory, membersUri);
} }
Cursor cursor = mMediaProvider.query(membersUri, PLAYLIST_MEMBERS_PROJECTION, null,
null, null);
try {
if (cursor == null || cursor.getCount() == 0) {
Log.d(TAG, "playlist is empty - deleting");
mMediaProvider.delete(uri, null, null);
}
} finally {
if (cursor != null) cursor.close();
}
} }
private void processPlayLists() throws RemoteException { private void processPlayLists() throws RemoteException {