LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Don't crash Tethering service when WiFi feature is missing" am: 736f8ec55a am: 5278b64768

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1577289

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice05e20436c5bab99e72f61179df055c657cc248
This commit is contained in:
Tomasz Wasilczyk
2021-02-18 20:30:16 +00:00
committed by Automerger Merge Worker
parent 8f356c1608 5278b64768
commit 6b10dc120d
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Tethering/src/com/android/networkstack/tethering/Tethering.java
View File

@@ -1689,12 +1689,14 @@ public class Tethering {
// If this is a Wi-Fi interface, tell WifiManager of any errors // If this is a Wi-Fi interface, tell WifiManager of any errors
// or the inactive serving state. // or the inactive serving state.
if (who.interfaceType() == TETHERING_WIFI) { if (who.interfaceType() == TETHERING_WIFI) {
if (who.lastError() != TETHER_ERROR_NO_ERROR) { final WifiManager mgr = getWifiManager();
getWifiManager().updateInterfaceIpState( final String iface = who.interfaceName();
who.interfaceName(), IFACE_IP_MODE_CONFIGURATION_ERROR); if (mgr == null) {
Log.wtf(TAG, "Skipping WifiManager notification about inactive tethering");
} else if (who.lastError() != TETHER_ERROR_NO_ERROR) {
mgr.updateInterfaceIpState(iface, IFACE_IP_MODE_CONFIGURATION_ERROR);
} else { } else {
getWifiManager().updateInterfaceIpState( mgr.updateInterfaceIpState(iface, IFACE_IP_MODE_UNSPECIFIED);
who.interfaceName(), IFACE_IP_MODE_UNSPECIFIED);
} }
} }
} }
@@ -2421,6 +2423,19 @@ public class Tethering {
mLog.log(iface + " is not a tetherable iface, ignoring"); mLog.log(iface + " is not a tetherable iface, ignoring");
return; return;
} }
final PackageManager pm = mContext.getPackageManager();
if ((interfaceType == TETHERING_WIFI || interfaceType == TETHERING_WIGIG)
&& !pm.hasSystemFeature(PackageManager.FEATURE_WIFI)) {
mLog.log(iface + " is not tetherable, because WiFi feature is disabled");
return;
}
if (interfaceType == TETHERING_WIFI_P2P
&& !pm.hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)) {
mLog.log(iface + " is not tetherable, because WiFi Direct feature is disabled");
return;
}
maybeTrackNewInterfaceLocked(iface, interfaceType); maybeTrackNewInterfaceLocked(iface, interfaceType);
} }

3
Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringTest.java
View File

@@ -586,6 +586,9 @@ public class TetheringTest {
ArgumentCaptor.forClass(SoftApCallback.class); ArgumentCaptor.forClass(SoftApCallback.class);
verify(mWifiManager).registerSoftApCallback(any(), softApCallbackCaptor.capture()); verify(mWifiManager).registerSoftApCallback(any(), softApCallbackCaptor.capture());
mSoftApCallback = softApCallbackCaptor.getValue(); mSoftApCallback = softApCallbackCaptor.getValue();
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)).thenReturn(true);
when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT)).thenReturn(true);
} }
private void setTetheringSupported(final boolean supported) { private void setTetheringSupported(final boolean supported) {