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

am 101fb9fe: Merge "Handle _ and % in paths" into jb-dev

Browse Source 
* commit '101fb9fe2b5001e8122e2965c115688c1f42bd63':
  Handle _ and % in paths
This commit is contained in:
Marco Nelissen
2012-05-23 07:46:14 -07:00
committed by Android Git Automerger
parent f608140b13 101fb9fe2b
commit ec1d16bf72
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1444,7 +1444,9 @@ public class MediaScanner
String where; String where;
String[] selectionArgs; String[] selectionArgs;
if (mCaseInsensitivePaths) { if (mCaseInsensitivePaths) {
where = Files.FileColumns.DATA + " LIKE ?"; // the 'like' makes it use the index, the 'lower()' makes it correct
// when the path contains sqlite wildcard characters
where = "_data LIKE ?1 AND lower(_data)=lower(?1)";
selectionArgs = new String[] { path }; selectionArgs = new String[] { path };
} else { } else {
where = Files.FileColumns.DATA + "=?"; where = Files.FileColumns.DATA + "=?";

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

@@ -932,8 +932,11 @@ public class MtpDatabase {
if (format == MtpConstants.FORMAT_ASSOCIATION) { if (format == MtpConstants.FORMAT_ASSOCIATION) {
// recursive case - delete all children first // recursive case - delete all children first
Uri uri = Files.getMtpObjectsUri(mVolumeName); Uri uri = Files.getMtpObjectsUri(mVolumeName);
int count = mMediaProvider.delete(uri, "_data LIKE ?", int count = mMediaProvider.delete(uri,
new String[] { path + "/%"}); // 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 + "/"});
} }
Uri uri = Files.getMtpObjectsUri(mVolumeName, handle); Uri uri = Files.getMtpObjectsUri(mVolumeName, handle);