Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I80bebcd0,I35f3718f into qt-dev

Browse Source 
am: 08793a3b64

Change-Id: I975d97c9ca37aaf74a10a0d6ca4b71fc914047d4
This commit is contained in:
Chalard Jean
2019-06-17 07:21:56 -07:00
committed by android-build-merger
parent 64b89ace25 08793a3b64
commit a63b604929
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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