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

Commit 53f3bc41 authored by Chalard Jean's avatar Chalard Jean Committed by android-build-merger
Browse files

Merge "Simplification of code to prevent a Log.wtf in expected cases." am:... 

Merge "Simplification of code to prevent a Log.wtf in expected cases." am: f54483b6 am: fbc68b97
am: 9e376b56

Change-Id: I846943dc91ef3cb6dc7516ba38dc93fb8a80bb88
parents 1d79e1b6 9e376b56

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

+14 −25
Original line number Original line Diff line number Diff line
@@ -178,31 +178,15 @@ public class NetworkNotificationManager { 
        CharSequence title;

        CharSequence title;

        CharSequence details;

        CharSequence details;

        int icon = getIcon(transportType, notifyType);

        int icon = getIcon(transportType, notifyType);

        if (notifyType == NotificationType.NO_INTERNET) {

        if (notifyType == NotificationType.NO_INTERNET && transportType == TRANSPORT_WIFI) {

            switch (transportType) {

                case TRANSPORT_WIFI:

            title = r.getString(R.string.wifi_no_internet,

            title = r.getString(R.string.wifi_no_internet,

                    WifiInfo.removeDoubleQuotes(nai.networkCapabilities.getSSID()));

                    WifiInfo.removeDoubleQuotes(nai.networkCapabilities.getSSID()));

            details = r.getString(R.string.wifi_no_internet_detailed);

            details = r.getString(R.string.wifi_no_internet_detailed);

                    break;

        } else if (notifyType == NotificationType.PARTIAL_CONNECTIVITY

                default:

                && transportType == TRANSPORT_WIFI) {

                    // 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,

            title = r.getString(R.string.network_partial_connectivity,

                    WifiInfo.removeDoubleQuotes(nai.networkCapabilities.getSSID()));

                    WifiInfo.removeDoubleQuotes(nai.networkCapabilities.getSSID()));

            details = r.getString(R.string.network_partial_connectivity_detailed);

            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 &&

        } else if (notifyType == NotificationType.LOST_INTERNET &&

                transportType == TRANSPORT_WIFI) {

                transportType == TRANSPORT_WIFI) {

            title = r.getString(R.string.wifi_no_internet,

            title = r.getString(R.string.wifi_no_internet,
@@ -248,6 +232,11 @@ public class NetworkNotificationManager { 
            title = r.getString(R.string.network_switch_metered, toTransport);

            title = r.getString(R.string.network_switch_metered, toTransport);

            details = r.getString(R.string.network_switch_metered_detail, toTransport,

            details = r.getString(R.string.network_switch_metered_detail, toTransport,

                    fromTransport);

                    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 {

        } else {

            Slog.wtf(TAG, "Unknown notification type " + notifyType + " on network transport "

            Slog.wtf(TAG, "Unknown notification type " + notifyType + " on network transport "

                    + getTransportName(transportType));

                    + getTransportName(transportType));