diff options
| author | Gabriele M <moto.falcon.git@gmail.com> | 2017-06-21 21:04:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-21 21:04:38 +0000 |
| commit | b83808783faa0bd06fbabe952b8302ef1e23a3ff (patch) | |
| tree | b4539eb9791394f6745727540a9e5d536174e159 | |
| parent | d106d45142feacc07432532faa205d2fbb77449a (diff) | |
| parent | 126130fd35bc83396d3e8ac0025970365953aea2 (diff) | |
| download | MediaProvider-b83808783faa0bd06fbabe952b8302ef1e23a3ff.tar.gz | |
Merge "MediaProvider: Fix where condition of delete queries" am: 1a00d31af4
am: 126130fd35
Change-Id: I17266b572dbdb2cb012ad4d942488c3fc0650ff5
| -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; } |