LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplification of code to prevent a Log.wtf in expected cases.

Browse Source 
This mostly serves to unindent code to make it locally more
readable. It is a functional no-op.

Bug: 135043192
Test: atest FrameworksNetTests
Change-Id: Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80
This commit is contained in:
Chalard Jean
2019-06-17 14:44:56 +09:00
parent c687700cde
commit 6988872c91
1 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
View File

@@ -178,31 +178,15 @@ public class NetworkNotificationManager {
CharSequence title;
CharSequence details;
int icon = getIcon(transportType, notifyType);
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;
}
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);
} else if (notifyType == NotificationType.LOST_INTERNET &&
transportType == TRANSPORT_WIFI) {
title = r.getString(R.string.wifi_no_internet,
@@ -248,6 +232,11 @@ public class NetworkNotificationManager {
title = r.getString(R.string.network_switch_metered, toTransport);
details = r.getString(R.string.network_switch_metered_detail, toTransport,
fromTransport);
} else if (notifyType == NotificationType.NO_INTERNET
|| notifyType == NotificationType.PARTIAL_CONNECTIVITY) {
// NO_INTERNET and PARTIAL_CONNECTIVITY notification for non-WiFi networks
// are sent, but they are not implemented yet.
return;
} else {
Slog.wtf(TAG, "Unknown notification type " + notifyType + " on network transport "
+ getTransportName(transportType));