commit 6b6e383d2bd712cc38380aa4d301dee4e3609a27
author Chiachang Wang <chiachangwang@google.com> Thu Jun 13 09:15:09 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 13 09:15:09 2019 +0000
tree d22e13df3deae5567dcd5027c0340a5c54ac1870
parent 6edc85b8e46cf39b867cf0f57a4a564943711c5d
parent a6cd3b1b896523371a109c4f7edb1e117ff719a0

Merge "Suppress the wtf log for notifications that are expected"

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,