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

Commit 31575098 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

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
parent ba3bf73e

src/com/android/settings/network/InternetUpdater.java

+2 −3
Original line number Diff line number Diff line
@@ -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<Integer, Integer> 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;