diff options
| author | Marco Nelissen <marcone@google.com> | 2017-06-23 16:52:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-23 16:52:50 +0000 |
| commit | 96e4a6d3f0a7c99d7e31e0808f146ada5726a5a4 (patch) | |
| tree | 3369e49dc7d54dca8a8b9e106f9d5bddaa0ea7de | |
| parent | ae3ef29bf92856b4f3538caac9647079475ac1e2 (diff) | |
| parent | 645dcd1e3c12e4e3b420abfc275748ff7c3740ac (diff) | |
| download | MediaProvider-96e4a6d3f0a7c99d7e31e0808f146ada5726a5a4.tar.gz | |
Merge "Revert "MediaProvider: Fix where condition of delete queries"" am: 654f73a379
am: 645dcd1e3c
Change-Id: Iaf21612636b7b8038b4188c0ced2468d59544b4f
| -rw-r--r-- | src/com/android/providers/media/MediaProvider.java | 8 |
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 355b76952..a3a0c71c4 100644 --- a/src/com/android/providers/media/MediaProvider.java +++ b/src/com/android/providers/media/MediaProvider.java @@ -3238,14 +3238,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; } |