Stop persist numAssociation
As we start tp persist most recently connected network for scan
optimizition, stop persist numAssociation
Bug: 148535554
Test: atest com.android.server.wifi
Change-Id: I8a8ec3db42a0a9887e2662c18f930e6be43b6506
diff --git a/service/java/com/android/server/wifi/util/XmlUtil.java b/service/java/com/android/server/wifi/util/XmlUtil.java
index 1984e41..eb204e7 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 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 @@
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 @@
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;
diff --git a/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java
index d04076a..80dfd7a 100644
--- a/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/NetworkListStoreDataTest.java
@@ -95,7 +95,6 @@
+ "<boolean name=\"MeteredHint\" value=\"false\" />\n"
+ "<int name=\"MeteredOverride\" value=\"2\" />\n"
+ "<boolean name=\"UseExternalScores\" value=\"false\" />\n"
- + "<int name=\"NumAssociation\" value=\"0\" />\n"
+ "<int name=\"CreatorUid\" value=\"%d\" />\n"
+ "<string name=\"CreatorName\">%s</string>\n"
+ "<int name=\"LastUpdateUid\" value=\"-1\" />\n"
@@ -151,7 +150,6 @@
+ "<boolean name=\"MeteredHint\" value=\"false\" />\n"
+ "<int name=\"MeteredOverride\" value=\"0\" />\n"
+ "<boolean name=\"UseExternalScores\" value=\"false\" />\n"
- + "<int name=\"NumAssociation\" value=\"0\" />\n"
+ "<int name=\"CreatorUid\" value=\"%d\" />\n"
+ "<string name=\"CreatorName\">%s</string>\n"
+ "<int name=\"LastUpdateUid\" value=\"-1\" />\n"
@@ -228,7 +226,6 @@
+ "<boolean name=\"MeteredHint\" value=\"false\" />\n"
+ "<int name=\"MeteredOverride\" value=\"0\" />\n"
+ "<boolean name=\"UseExternalScores\" value=\"false\" />\n"
- + "<int name=\"NumAssociation\" value=\"0\" />\n"
+ "<int name=\"CreatorUid\" value=\"%d\" />\n"
+ "<string name=\"CreatorName\">%s</string>\n"
+ "<int name=\"LastUpdateUid\" value=\"-1\" />\n"
@@ -291,7 +288,6 @@
+ "<boolean name=\"MeteredHint\" value=\"false\" />\n"
+ "<int name=\"MeteredOverride\" value=\"0\" />\n"
+ "<boolean name=\"UseExternalScores\" value=\"false\" />\n"
- + "<int name=\"NumAssociation\" value=\"0\" />\n"
+ "<int name=\"CreatorUid\" value=\"%d\" />\n"
+ "<string name=\"CreatorName\">%s</string>\n"
+ "<int name=\"LastUpdateUid\" value=\"-1\" />\n"
@@ -528,7 +524,6 @@
+ "<boolean name=\"NoInternetAccessExpected\" value=\"false\" />\n"
+ "<boolean name=\"MeteredHint\" value=\"false\" />\n"
+ "<boolean name=\"UseExternalScores\" value=\"false\" />\n"
- + "<int name=\"NumAssociation\" value=\"0\" />\n"
+ "<int name=\"CreatorUid\" value=\"%d\" />\n"
+ "<null name=\"CreatorName\" />\n"
+ "<int name=\"LastUpdateUid\" value=\"-1\" />\n"
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java
index 8341654..671076b 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreTest.java
@@ -107,7 +107,6 @@
+ "<boolean name=\"MeteredHint\" value=\"false\" />\n"
+ "<int name=\"MeteredOverride\" value=\"0\" />\n"
+ "<boolean name=\"UseExternalScores\" value=\"false\" />\n"
- + "<int name=\"NumAssociation\" value=\"0\" />\n"
+ "<int name=\"CreatorUid\" value=\"%d\" />\n"
+ "<string name=\"CreatorName\">%s</string>\n"
+ "<int name=\"LastUpdateUid\" value=\"-1\" />\n"
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java
index e41bb59..b991104 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigurationTestUtil.java
@@ -635,7 +635,7 @@
assertEquals(expected.meteredHint, actual.meteredHint);
assertEquals(expected.meteredOverride, actual.meteredOverride);
assertEquals(expected.useExternalScores, actual.useExternalScores);
- assertEquals(expected.numAssociation, actual.numAssociation);
+ assertEquals(0, actual.numAssociation);
assertEquals(expected.creatorUid, actual.creatorUid);
assertEquals(expected.creatorName, actual.creatorName);
assertEquals(expected.lastUpdateUid, actual.lastUpdateUid);
