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

Merge "MtpDatabase: Fix sqlite3 pattern matching for MTP directory deletes" into jb-dev

Browse Source
This commit is contained in:
Mike Lockwood
2012-06-26 16:57:02 -07:00
committed by Android (Google) Code Review
parent 947ce39e56 1e855d98aa
commit 7017d51e14
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/mtp/MtpDatabase.java
View File

@@ -933,10 +933,10 @@ public class MtpDatabase {
// recursive case - delete all children first
Uri uri = Files.getMtpObjectsUri(mVolumeName);
int count = mMediaProvider.delete(uri,
// the 'like' makes it use the index, the 'lower()' makes it correct
// when the path contains sqlite wildcard characters
"_data LIKE ? AND lower(substr(_data,?))=lower(?)",
new String[] { path + "/%", "" + path.length() + 1, path + "/"});
// the 'like' makes it use the index, the 'lower()' makes it correct
// when the path contains sqlite wildcard characters
"_data LIKE ?1 AND lower(substr(_data,1,?2))=lower(?3)",
new String[] { path + "/%",Integer.toString(path.length() + 1), path + "/"});
}
Uri uri = Files.getMtpObjectsUri(mVolumeName, handle);