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

Fix crash and duplicated ethernet tethering request

Browse Source 
This change fix two things:
1. Handle ethernet callback in internal thread to avoid crash. IpServer
should be created from tethering thread, otherwise mIpNeighborMonitor of
IpServer would throw
   IllegalStateException("start() called from off-thread")
2. Ethernet tethering request may be duplicated if multiple
startTethering is called but no stopTethering

Bug: 130840861
Bug: 148824036
Test: ON/OFF ethernet tehtering manually
      atest TetheringTests

Change-Id: I7c5127e96d80d077735010d2e62c7227805ccb10
This commit is contained in:
markchien
2020-02-26 20:54:55 +08:00
parent afeed9dee4
commit c8e7d759be
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/net/EthernetManager.java
View File

@@ -28,6 +28,7 @@ import android.os.RemoteException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.Executor;
/** /**
* A class representing the IP configuration of the Ethernet network. * A class representing the IP configuration of the Ethernet network.
@@ -248,18 +249,19 @@ public class EthernetManager {
* @param callback A callback to be called once the request has been fulfilled. * @param callback A callback to be called once the request has been fulfilled.
*/ */
@NonNull @NonNull
public TetheredInterfaceRequest requestTetheredInterface( public TetheredInterfaceRequest requestTetheredInterface(@NonNull final Executor executor,
@NonNull TetheredInterfaceCallback callback) { @NonNull final TetheredInterfaceCallback callback) {
Objects.requireNonNull(callback, "Callback must be non-null"); Objects.requireNonNull(callback, "Callback must be non-null");
Objects.requireNonNull(executor, "Executor must be non-null");
final ITetheredInterfaceCallback cbInternal = new ITetheredInterfaceCallback.Stub() { final ITetheredInterfaceCallback cbInternal = new ITetheredInterfaceCallback.Stub() {
@Override @Override
public void onAvailable(String iface) { public void onAvailable(String iface) {
callback.onAvailable(iface); executor.execute(() -> callback.onAvailable(iface));
} }
@Override @Override
public void onUnavailable() { public void onUnavailable() {
callback.onUnavailable(); executor.execute(() -> callback.onUnavailable());
} }
}; };