diff options
| author | Gabriele M <moto.falcon.git@gmail.com> | 2017-06-21 21:10:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-21 21:10:30 +0000 |
| commit | f3d97079197538c90f288dd10709b1b30d9eedb9 (patch) | |
| tree | 138c794712a34cf7298afb7f8a7d1f1fa559b506 | |
| parent | f651f9f36c0494ae5dc547923e6bd15101c9ace6 (diff) | |
| parent | 1adc43272897b5d763dfec11595bed433527a847 (diff) | |
| download | MediaProvider-f3d97079197538c90f288dd10709b1b30d9eedb9.tar.gz | |
Merge "MediaProvider: Fix where condition of delete queries" am: 1a00d31af4 am: 126130fd35 am: b83808783f
am: 1adc432728
Change-Id: I974bd79c378ee7a2cccd28f235ff06683ac1ee2b
| -rw-r--r-- | src/com/android/providers/media/MediaProvider.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/com/android/providers/media/MediaProvider.java b/src/com/android/providers/media/MediaProvider.java index a3a0c71c4..355b76952 100644 --- a/src/com/android/providers/media/MediaProvider.java +++ b/src/com/android/providers/media/MediaProvider.java @@ -3238,6 +3238,14 @@ 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; } |