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

Fix overriding ip configurtion with default one

Browse Source 
EthernetConfigStore should return 'null' for default interface if the
default interface hasn't been configured otherwise it would be hard to
distinguish not-configured vs configured with default values.

Bug: 79415136
Test: verified w/o .xml overlay Ethernet continues to work
Test: verified that ip config from overlay is not getting overriden
Change-Id: I4eb914923f3664b12b6af0ae05f45b60c5312b02
This commit is contained in:
Pavel Maltsev
2018-05-09 14:49:33 -07:00
parent b23181bbe9
commit a8f3c01be9
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);
} }
} }
} }