Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit accf7105 authored by Chalard Jean's avatar Chalard Jean
Browse files

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

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

Bug: 135043192
Test: atest FrameworksNetTests
Merged-In: Iad0e9a28670e96a3c953518a0d0ccd77e2f2fa80
Change-Id: I80bebcd04c277f6e4b0665fe1253b2309e3bc535
(cherry picked from commit e1f57593)
parent d977c2b1

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

+14 −25
Original line number Diff line number Diff line
@@ -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:

        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);

                    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:

        } 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);

                    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,
@@ -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));