diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2019-06-13 02:29:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-13 02:29:06 -0700 |
| commit | 1bb46d0637ec062e80a2ddb1bc8a5dc2cf185426 (patch) | |
| tree | 074261971b42bc5de4936191c68e071afc177b2c | |
| parent | 96203430d3cacb922f12defe6ea70b9e90290ac9 (diff) | |
| parent | 4e3761e1d97f01d205f793fe97404da5a3269694 (diff) | |
Merge "Suppress the wtf log for notifications that are expected" am: bca9bceffb
am: 4e3761e1d9
Change-Id: Ia1c2a765b0fb0cc8d440c02533bdc15774a5a3ef
| -rw-r--r-- | services/core/java/com/android/server/connectivity/NetworkNotificationManager.java | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java index f6735d983466..bcf5a71344b0 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, |