diff --git a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
index f6735d9834..bcf5a71344 100644
--- a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
+++ b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
@@ -178,15 +178,31 @@ public class NetworkNotificationManager {
         CharSequence title;
         CharSequence details;
         int icon = getIcon(transportType, notifyType);
-        if (notifyType == NotificationType.NO_INTERNET && transportType == TRANSPORT_WIFI) {
-            title = r.getString(R.string.wifi_no_internet,
-                    WifiInfo.removeDoubleQuotes(nai.networkCapabilities.getSSID()));
-            details = r.getString(R.string.wifi_no_internet_detailed);
-        } else if (notifyType == NotificationType.PARTIAL_CONNECTIVITY
-                && transportType == TRANSPORT_WIFI) {
-            title = r.getString(R.string.network_partial_connectivity,
-                    WifiInfo.removeDoubleQuotes(nai.networkCapabilities.getSSID()));
-            details = r.getString(R.string.network_partial_connectivity_detailed);
+        if (notifyType == NotificationType.NO_INTERNET) {
+            switch (transportType) {
+                case TRANSPORT_WIFI:
+                    title = r.getString(R.string.wifi_no_internet,
+                        WifiInfo.removeDoubleQuotes(nai.networkCapabilities.getSSID()));
+                    details = r.getString(R.string.wifi_no_internet_detailed);
+                    break;
+                default:
+                    // TODO: Display notifications for those networks that provide internet.
+                    // except VPN.
+                    return;
+            }
+
+        } else if (notifyType == NotificationType.PARTIAL_CONNECTIVITY) {
+            switch (transportType) {
+                case TRANSPORT_WIFI:
+                    title = r.getString(R.string.network_partial_connectivity,
+                        WifiInfo.removeDoubleQuotes(nai.networkCapabilities.getSSID()));
+                    details = r.getString(R.string.network_partial_connectivity_detailed);
+                    break;
+                default:
+                    // TODO: Display notifications for those networks that provide internet.
+                    // except VPN.
+                    return;
+            }
         } else if (notifyType == NotificationType.LOST_INTERNET &&
                 transportType == TRANSPORT_WIFI) {
             title = r.getString(R.string.wifi_no_internet,