diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-01 00:19:36 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-01 00:19:36 +0000 |
commit | ee063ea0e728344bb3e0f875e91c3c4caf150fe8 (patch) | |
tree | 32c77c372edc2cd42dfeea75bdee71f95dc13b6e | |
parent | f5de8f61b73195c1d057607d37a4af8326354ec7 (diff) | |
parent | 9f0660caab5917c93614741ec8b7dead120554f6 (diff) | |
download | android_packages_providers_DownloadProvider-ee063ea0e728344bb3e0f875e91c3c4caf150fe8.tar.gz android_packages_providers_DownloadProvider-ee063ea0e728344bb3e0f875e91c3c4caf150fe8.tar.bz2 android_packages_providers_DownloadProvider-ee063ea0e728344bb3e0f875e91c3c4caf150fe8.zip |
Merge cherrypicks of [9111140, 9111141, 9111142, 9111143, 9109055] into qt-release
Change-Id: I5ea01972a17067981e4908ea132532e733f3f0bc
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 5 | ||||
-rw-r--r-- | tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 550c8fba..eb0313c7 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -851,6 +851,8 @@ public final class DownloadProvider extends ContentProvider { mediaStoreUri.toString()); filteredValues.put(COLUMN_MEDIA_SCANNED, MEDIA_SCANNED); } + MediaStore.scanFile(getContext(), + new File(filteredValues.getAsString(Downloads.Impl._DATA))); } finally { restoreCallingIdentity(token); } @@ -1551,6 +1553,9 @@ public final class DownloadProvider extends ContentProvider { qb.update(db, updateValues, Downloads.Impl._ID + "=?", new String[] { Long.toString(info.mId) }); } + if (Downloads.Impl.isStatusSuccess(info.mStatus)) { + MediaStore.scanFile(getContext(), new File(info.mFileName)); + } } if (updateSchedule) { Helpers.scheduleJob(context, info); diff --git a/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java b/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java index 38bf4d65..6acdfed5 100644 --- a/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java +++ b/tests/src/com/android/providers/downloads/AbstractDownloadProviderFunctionalTest.java @@ -33,6 +33,7 @@ import android.database.DatabaseUtils; import android.database.MatrixCursor; import android.net.Uri; import android.os.Binder; +import android.os.Bundle; import android.os.IBinder; import android.provider.Downloads; import android.provider.MediaStore; @@ -123,6 +124,11 @@ public abstract class AbstractDownloadProviderFunctionalTest extends } @Override + public Bundle call(String method, String request, Bundle args) { + return new Bundle(); + } + + @Override public IBinder getIContentProviderBinder() { return new Binder(); } |