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

am: 741c4b7439

Change-Id: I2ef6009364bd1420c915df003e2ff5c3857ef3e7

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

@@ -2842,6 +2842,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)