Merge "Clear all lingering notifications when network is disconnected" am: 1037bbb82a

am: da969f4f40

Change-Id: I441a37682e11aa349301750c26545c5c0f1a274a

services/core/java/com/android/server/ConnectivityService.java

@@ -2832,6 +2832,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
         if (DBG) {
             log(nai.name() + " got DISCONNECTED, was satisfying " + nai.numNetworkRequests());
         }
+        // Clear all notifications of this network.
+        mNotifier.clearNotification(nai.network.netId);
         // A network agent has disconnected.
         // TODO - if we move the logic to the network agent (have them disconnect
         // because they lost all their requests or because their score isn't good)