Stub out and test system notifications.

This change abstracts NotificationManager interactions behind
SystemFacade and takes advantage of that to test notifications, to a
limited degree.

It also fixes a silly typo in AbstractDownloadManagerFunctionalTest,
and it introduces an extra sleep between tests to avoid some
flakiness.  I'll look for a better solution to that problem after this
change goes in.

Change-Id: I3a0307f828955cd45b0e3581ad499da28cc0556e

1 files changed, 3 insertions, 8 deletions

diff --git a/src/com/android/providers/downloads/DownloadReceiver.java b/src/com/android/providers/downloads/DownloadReceiver.java
index 98c37103..852c3712 100644
--- a/src/com/android/providers/downloads/DownloadReceiver.java
+++ b/src/com/android/providers/downloads/DownloadReceiver.java
@@ -16,9 +16,6 @@
 
 package com.android.providers.downloads;
 
-import com.google.common.annotations.VisibleForTesting;
-
-import android.app.NotificationManager;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.ContentUris;
@@ -34,6 +31,8 @@ import android.provider.Downloads;
 import android.util.Config;
 import android.util.Log;
 
+import com.google.common.annotations.VisibleForTesting;
+
 import java.io.File;
 
 /**
@@ -164,11 +163,7 @@ public class DownloadReceiver extends BroadcastReceiver {
                 }
                 cursor.close();
             }
-            NotificationManager notMgr = (NotificationManager) context
-                    .getSystemService(Context.NOTIFICATION_SERVICE);
-            if (notMgr != null) {
-                notMgr.cancel((int) ContentUris.parseId(intent.getData()));
-            }
+            mSystemFacade.cancelNotification((int) ContentUris.parseId(intent.getData()));
         } else if (intent.getAction().equals(Constants.ACTION_HIDE)) {
             if (Constants.LOGVV) {
                 Log.v(Constants.TAG, "Receiver hide for " + intent.getData());