Avoid calling into MediaProvider from DownloadProvider.onCreate().

- Postpone marking few potential files in mediastore as downloads
  by reusing the MediaScanTriggerJob.
- Take care of deleting/orphaning downloads belonging to uninstalled
  packages upon receiving MEDIA_MOUNTED broadcast. This should also
  prevent DownloadProvider from accessing external storage before
  it is available.

Fixes: 140200277
Fixes: 154350921
Test: atest tests/app/src/android/app/cts/DownloadManagerTest.java
Test: manual

Change-Id: I57a05495b6aed3443c20ca3ca3c8a06ae87f3748

1 files changed, 3 insertions, 6 deletions

diff --git a/tests/src/com/android/providers/downloads/HelpersTest.java b/tests/src/com/android/providers/downloads/HelpersTest.java
index 9cb99baa..61515cee 100644
--- a/tests/src/com/android/providers/downloads/HelpersTest.java
+++ b/tests/src/com/android/providers/downloads/HelpersTest.java
@@ -41,6 +41,7 @@ import android.content.pm.PackageManager;
 import android.database.MatrixCursor;
 import android.net.Uri;
 import android.os.Environment;
+import android.os.Process;
 import android.provider.Downloads;
 
 import android.test.AndroidTestCase;
@@ -189,10 +190,9 @@ public class HelpersTest extends AndroidTestCase {
         final ContentProvider downloadProvider = mock(ContentProvider.class);
         when(downloadProvider.query(eq(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI),
                 any(String[].class), any(String.class),isNull(), isNull())).thenReturn(cursor);
-        final BiConsumer<String, Long> validEntryConsumer = mock(BiConsumer.class);
 
         // Call
-        Helpers.handleRemovedUidEntries(context, downloadProvider, -1, validEntryConsumer);
+        Helpers.handleRemovedUidEntries(context, downloadProvider, Process.INVALID_UID);
 
         // Verify
         verify(downloadProvider).update(eq(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI),
@@ -204,9 +204,6 @@ public class HelpersTest extends AndroidTestCase {
                 argThat(selection -> Arrays.equals(
                         idsToRemove.toArray(), extractIdsFromSelection(selection))),
                 isNull());
-        for (int i = 0; i < validEntries.size(); ++i) {
-            verify(validEntryConsumer).accept(validEntries.valueAt(i), validEntries.keyAt(i));
-        }
 
 
         // Reset
@@ -222,7 +219,7 @@ public class HelpersTest extends AndroidTestCase {
                 any(String[].class), any(String.class),isNull(), isNull())).thenReturn(cursor2);
 
         // Call
-        Helpers.handleRemovedUidEntries(context, downloadProvider, TEST_UID2, null);
+        Helpers.handleRemovedUidEntries(context, downloadProvider, TEST_UID2);
 
         // Verify
         verify(downloadProvider).update(eq(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI),