From 315750988512f5461089f21657faea79f197af52 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Fri, 19 Mar 2021 21:03:25 +0800 Subject: [PATCH] Remove hidden @Transport usage NetworkCapabilities is moving to connectivity mainline module. The hidden methods and constants accesses are not allowed anymore for Settings, so remove the usage. Bug: 172183305 Test: make RunSettingsRoboTests ROBOTEST_FILTER=\ com.android.settings.network.InternetUpdaterTest Change-Id: I3adec99748451f32698ac19bfeaeb9db43282e3e --- src/com/android/settings/network/InternetUpdater.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/network/InternetUpdater.java b/src/com/android/settings/network/InternetUpdater.java index 2f704e72a74..39672765725 100644 --- a/src/com/android/settings/network/InternetUpdater.java +++ b/src/com/android/settings/network/InternetUpdater.java @@ -32,7 +32,6 @@ import android.net.ConnectivityManager; import android.net.ConnectivityManager.NetworkCallback; import android.net.Network; import android.net.NetworkCapabilities; -import android.net.NetworkCapabilities.Transport; import android.net.wifi.WifiManager; import android.util.Log; @@ -132,7 +131,7 @@ public class InternetUpdater implements AirplaneModeEnabler.OnAirplaneModeChange @VisibleForTesting boolean mInternetAvailable; @VisibleForTesting - @Transport int mTransport; + int mTransport; private static Map sTransportMap = new HashMap<>(); static { sTransportMap.put(TRANSPORT_WIFI, INTERNET_WIFI); @@ -227,7 +226,7 @@ public class InternetUpdater implements AirplaneModeEnabler.OnAirplaneModeChange } boolean internetAvailable = false; - for (@Transport int transport : networkCapabilities.getTransportTypes()) { + for (int transport : networkCapabilities.getTransportTypes()) { if (sTransportMap.containsKey(transport)) { mTransport = transport; internetAvailable = true;