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

Merge "Remove InterfaceState and Role @IntDef from TetheredSettings." am: ebebc5e1e9 am: 39bc6f906f am: 60dfd4e89f am: 602ea501a6

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

Change-Id: I5a7d5891529db39df54a9a02cdae5d86ae86bac2
This commit is contained in:
Xiao Ma
2022-03-04 09:24:27 +00:00
committed by Automerger Merge Worker
parent c9589e9aef 602ea501a6
commit c82d7c9d22
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/TetherSettings.java
View File

@@ -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 {