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

Commit 602ea501 authored by Xiao Ma's avatar Xiao Ma Committed by Automerger Merge Worker
Browse files

Merge "Remove InterfaceState and Role @IntDef from TetheredSettings." am:... 

Merge "Remove InterfaceState and Role @IntDef from TetheredSettings." am: ebebc5e1 am: 39bc6f90 am: 60dfd4e8

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

Change-Id: Ide96b958cd24eb08aac39fd58d6d9d681b9686b0
parents f578c547 60dfd4e8

src/com/android/settings/TetherSettings.java

+2 −4
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ import android.content.IntentFilter; 
import android.hardware.usb.UsbManager;

import android.net.ConnectivityManager;

import android.net.EthernetManager;

import android.net.EthernetManager.InterfaceState;

import android.net.EthernetManager.Role;

import android.net.IpConfiguration;

import android.net.TetheringManager;

import android.net.wifi.WifiManager;
@@ -650,8 +648,8 @@ public class TetherSettings extends RestrictedSettingsFragment 
    }



    private final class EthernetListener implements EthernetManager.InterfaceStateListener {

        public void onInterfaceStateChanged(@NonNull String iface, @InterfaceState int state,

                @Role int role, @NonNull IpConfiguration configuration) {

        public void onInterfaceStateChanged(@NonNull String iface, int state, int role,

                @NonNull IpConfiguration configuration) {

            if (state == EthernetManager.STATE_LINK_UP) {

                mAvailableInterfaces.add(iface);

            } else {