summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-04-16 21:04:42 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-04-16 21:04:42 +0000
commit2cdbd0860a83e252ea3b0da27cf4d5d0e86d50d7 (patch)
tree5f87b2d2ec26843995faefbfb3547c212c2b9851 /service
parent656f7b75dcb6c972378235683d5653d8fd086c89 (diff)
parentac4037a47512e6a8508a06225ee47a7939c84605 (diff)
Merge "Stop persist numAssociation" into rvc-dev
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/util/XmlUtil.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/service/java/com/android/server/wifi/util/XmlUtil.java b/service/java/com/android/server/wifi/util/XmlUtil.java
index 1984e4123..eb204e73d 100644
--- a/service/java/com/android/server/wifi/util/XmlUtil.java
+++ b/service/java/com/android/server/wifi/util/XmlUtil.java
@@ -342,7 +342,6 @@ public class XmlUtil {
public static final String XML_TAG_METERED_HINT = "MeteredHint";
public static final String XML_TAG_METERED_OVERRIDE = "MeteredOverride";
public static final String XML_TAG_USE_EXTERNAL_SCORES = "UseExternalScores";
- public static final String XML_TAG_NUM_ASSOCIATION = "NumAssociation";
public static final String XML_TAG_CREATOR_UID = "CreatorUid";
public static final String XML_TAG_CREATOR_NAME = "CreatorName";
public static final String XML_TAG_LAST_UPDATE_UID = "LastUpdateUid";
@@ -504,7 +503,6 @@ public class XmlUtil {
XmlUtil.writeNextValue(out, XML_TAG_METERED_OVERRIDE, configuration.meteredOverride);
XmlUtil.writeNextValue(
out, XML_TAG_USE_EXTERNAL_SCORES, configuration.useExternalScores);
- XmlUtil.writeNextValue(out, XML_TAG_NUM_ASSOCIATION, configuration.numAssociation);
XmlUtil.writeNextValue(out, XML_TAG_CREATOR_UID, configuration.creatorUid);
XmlUtil.writeNextValue(out, XML_TAG_CREATOR_NAME, configuration.creatorName);
XmlUtil.writeNextValue(out, XML_TAG_LAST_UPDATE_UID, configuration.lastUpdateUid);
@@ -674,9 +672,6 @@ public class XmlUtil {
case XML_TAG_USE_EXTERNAL_SCORES:
configuration.useExternalScores = (boolean) value;
break;
- case XML_TAG_NUM_ASSOCIATION:
- configuration.numAssociation = (int) value;
- break;
case XML_TAG_CREATOR_UID:
configuration.creatorUid = (int) value;
break;