commit 67322170b51b22b921ed1b09fb3da4d683451aaa
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 14 07:02:17 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 14 07:02:17 2019 +0000
tree 6fd7f768e08b5149a28b1ae8e01d3fe5f102c505
parent 6b6e383d2bd712cc38380aa4d301dee4e3609a27
parent d5085f30932c36e13e576309c5334bb623e7969e

Merge "Change factoryReset to succeed for Settings"

services/core/java/com/android/server/connectivity/NetworkNotificationManager.java

diff --git a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
index f6735d9..bcf5a71 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 @@
         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,