summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2017-06-23 16:47:54 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-23 16:47:54 +0000
commit645dcd1e3c12e4e3b420abfc275748ff7c3740ac (patch)
tree1ccbab8b45d108b4cf7ce1b8e36f3f633b4e338c
parent1585191f62b6b30e9a9eb6bb106863dc261fd9c4 (diff)
parent654f73a379a36e5f4cdb2fc4cdfbc06971bff212 (diff)
downloadMediaProvider-645dcd1e3c12e4e3b420abfc275748ff7c3740ac.tar.gz
Merge "Revert "MediaProvider: Fix where condition of delete queries""
am: 654f73a379 Change-Id: Iab48622b3af0447b3c96a6f98e6b8f0ff1b0fa4c
-rw-r--r--src/com/android/providers/media/MediaProvider.java8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java
index 9644a20c9..e181e599c 100644
--- a/src/com/android/providers/media/MediaProvider.java
+++ b/src/com/android/providers/media/MediaProvider.java
@@ -4256,14 +4256,6 @@ public class MediaProvider extends ContentProvider {
"(" + sGetTableAndWhereParam.where + ")" +
" AND (_id NOT IN (SELECT parent FROM files" +
" WHERE NOT (" + sGetTableAndWhereParam.where + ")))";
- if (whereArgs != null) {
- String[] whereArgsNew = new String[whereArgs.length * 2];
- for (int i = 0; i < whereArgs.length; i++) {
- whereArgsNew[i] = whereArgs[i];
- whereArgsNew[whereArgs.length + i] = whereArgs[i];
- }
- whereArgs = whereArgsNew;
- }
} else {
sGetTableAndWhereParam.where = ID_NOT_PARENT_CLAUSE;
}