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

Commit 9c918200 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove hidden @Transport usage" into sc-dev am: b2eb0317 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13922079

Change-Id: I3592c4b292dbaf8930438d0f2f2c1d92514035d3
parents 40cc4f0d b2eb0317

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

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