summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHai Shalom <haishalom@google.com>2020-03-19 22:05:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-03-19 22:05:41 +0000
commite7db7533d4ad2a9a831523aadbdf6f5ebc23004c (patch)
tree30597d28e81d276a4da2c6fe370884fe036e93ac
parent58f7ed03176149e6d896f61a33cbb16eb5092467 (diff)
parent50eede4c32b2160b8460496388bd12dd85d4e26a (diff)
Merge "Avoid unnecessary warning logs in XmlUtil" into rvc-dev
-rw-r--r--service/java/com/android/server/wifi/util/XmlUtil.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/util/XmlUtil.java b/service/java/com/android/server/wifi/util/XmlUtil.java
index 94d60e756..da22f8b1f 100644
--- a/service/java/com/android/server/wifi/util/XmlUtil.java
+++ b/service/java/com/android/server/wifi/util/XmlUtil.java
@@ -839,6 +839,9 @@ public class XmlUtil {
writeStaticIpConfigurationToXml(
out, ipConfiguration.getStaticIpConfiguration());
break;
+ case DHCP:
+ case UNASSIGNED:
+ break;
default:
Log.w(TAG, "Ignoring unknown ip assignment type: "
+ ipConfiguration.getIpAssignment());
@@ -867,6 +870,9 @@ public class XmlUtil {
out, XML_TAG_PROXY_PAC_FILE,
ipConfiguration.getHttpProxy().getPacFileUrl().toString());
break;
+ case NONE:
+ case UNASSIGNED:
+ break;
default:
Log.w(TAG, "Ignoring unknown proxy settings type: "
+ ipConfiguration.getProxySettings());