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

Fixed fatal exception in EthernetServiceThread

Browse Source 
am: b95be5972e

Change-Id: I9ae1b1fb00552931882ce0b1eafd6696f217c96e
This commit is contained in:
Wally Yau
2019-05-30 09:40:39 -07:00
committed by android-build-merger
parent 571f7a6b67 b95be5972e
commit 13a87fbc0e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
View File

@@ -21,6 +21,7 @@ import static android.net.shared.LinkPropertiesParcelableUtil.toStableParcelable
import static com.android.internal.util.Preconditions.checkNotNull; import static com.android.internal.util.Preconditions.checkNotNull;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.IpConfiguration; import android.net.IpConfiguration;
@@ -53,6 +54,7 @@ import com.android.internal.util.IndentingPrintWriter;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.lang.Math; import java.lang.Math;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.Objects;
/** /**
* {@link NetworkFactory} that represents Ethernet networks. * {@link NetworkFactory} that represents Ethernet networks.
@@ -252,10 +254,10 @@ public class EthernetNetworkFactory extends NetworkFactory {
private boolean mLinkUp; private boolean mLinkUp;
private LinkProperties mLinkProperties = new LinkProperties(); private LinkProperties mLinkProperties = new LinkProperties();
private volatile IIpClient mIpClient; private volatile @Nullable IIpClient mIpClient;
private IpClientCallbacksImpl mIpClientCallback; private @Nullable IpClientCallbacksImpl mIpClientCallback;
private NetworkAgent mNetworkAgent; private @Nullable NetworkAgent mNetworkAgent;
private IpConfiguration mIpConfig; private @Nullable IpConfiguration mIpConfig;
/** /**
* An object to contain all transport type information, including base network score and * An object to contain all transport type information, including base network score and
@@ -376,7 +378,7 @@ public class EthernetNetworkFactory extends NetworkFactory {
} }
void setIpConfig(IpConfiguration ipConfig) { void setIpConfig(IpConfiguration ipConfig) {
if (this.mIpConfig.equals(ipConfig)) { if (Objects.equals(this.mIpConfig, ipConfig)) {
if (DBG) Log.d(TAG, "ipConfig have not changed,so ignore setIpConfig"); if (DBG) Log.d(TAG, "ipConfig have not changed,so ignore setIpConfig");
return; return;
} }