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

Merge "Fix overriding ip configurtion with default one" into pi-dev am: 6f017e3319

Browse Source 
am: 34c892c1d1

Change-Id: I98133ad41229b93f51ea3976d311f9896456a56c
This commit is contained in:
Pavel Maltsev
2018-05-15 17:08:42 -07:00
committed by android-build-merger
parent d04b24f60e 34c892c1d1
commit 1e83b82827
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
service-t/src/com/android/server/ethernet/EthernetConfigStore.java
View File

@@ -16,6 +16,7 @@
package com.android.server.ethernet; package com.android.server.ethernet;
import android.annotation.Nullable;
import android.net.IpConfiguration; import android.net.IpConfiguration;
import android.os.Environment; import android.os.Environment;
import android.util.ArrayMap; import android.util.ArrayMap;
@@ -77,9 +78,11 @@ public class EthernetConfigStore {
} }
} }
@Nullable
public IpConfiguration getIpConfigurationForDefaultInterface() { public IpConfiguration getIpConfigurationForDefaultInterface() {
synchronized (mSync) { synchronized (mSync) {
return new IpConfiguration(mIpConfigurationForDefaultInterface); return mIpConfigurationForDefaultInterface == null
? null : new IpConfiguration(mIpConfigurationForDefaultInterface);
} }
} }
} }