Fix overriding ip configurtion with default one
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:
@@ -16,6 +16,7 @@
|
||||
|
||||
package com.android.server.ethernet;
|
||||
|
||||
import android.annotation.Nullable;
|
||||
import android.net.IpConfiguration;
|
||||
import android.os.Environment;
|
||||
import android.util.ArrayMap;
|
||||
@@ -77,9 +78,11 @@ public class EthernetConfigStore {
|
||||
}
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public IpConfiguration getIpConfigurationForDefaultInterface() {
|
||||
synchronized (mSync) {
|
||||
return new IpConfiguration(mIpConfigurationForDefaultInterface);
|
||||
return mIpConfigurationForDefaultInterface == null
|
||||
? null : new IpConfiguration(mIpConfigurationForDefaultInterface);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user