PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove hidden @Transport usage" into sc-dev

Browse Source
This commit is contained in:
Chiachang Wang
2021-03-22 02:43:59 +00:00
committed by Android (Google) Code Review
parent 8bdbdf4b91 3157509885
commit b2eb0317a4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/InternetUpdater.java
View File

@@ -32,7 +32,6 @@ import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback; import android.net.ConnectivityManager.NetworkCallback;
import android.net.Network; import android.net.Network;
import android.net.NetworkCapabilities; import android.net.NetworkCapabilities;
import android.net.NetworkCapabilities.Transport;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.util.Log; import android.util.Log;
@@ -132,7 +131,7 @@ public class InternetUpdater implements AirplaneModeEnabler.OnAirplaneModeChange
@VisibleForTesting @VisibleForTesting
boolean mInternetAvailable; boolean mInternetAvailable;
@VisibleForTesting @VisibleForTesting
@Transport int mTransport; int mTransport;
private static Map<Integer, Integer> sTransportMap = new HashMap<>(); private static Map<Integer, Integer> sTransportMap = new HashMap<>();
static { static {
sTransportMap.put(TRANSPORT_WIFI, INTERNET_WIFI); sTransportMap.put(TRANSPORT_WIFI, INTERNET_WIFI);
@@ -227,7 +226,7 @@ public class InternetUpdater implements AirplaneModeEnabler.OnAirplaneModeChange
} }
boolean internetAvailable = false; boolean internetAvailable = false;
for (@Transport int transport : networkCapabilities.getTransportTypes()) { for (int transport : networkCapabilities.getTransportTypes()) {
if (sTransportMap.containsKey(transport)) { if (sTransportMap.containsKey(transport)) {
mTransport = transport; mTransport = transport;
internetAvailable = true; internetAvailable = true;