Fix the "Fix broken merge of "handle bssid blacklist in case of dhcp failures""
The change Iad35fb8dc2ce14874ef7424c4be5648ca7ac916c (Fix broken merge of ...)
seem be a partial resolution of Iba13db478ed69976c37bd4882f59bf0cae2212e6: the
parcel ser/des lines are missing.
This is causing today a merge conflict (lmp-dev -> master) on a dependent
change (I89b4f5c05a1f64f9d1e8c407f62036efa0265043), which is confused by
the lack of the parcel ser/des lines.
I think this was a genuine mistakes. Readding these lines should make
the conflict go away and fix master.
Change-Id: I8499b9caeb1667f95727fdd18f318c5859a2321e
diff --git a/wifi/java/android/net/wifi/ScanResult.java b/wifi/java/android/net/wifi/ScanResult.java
index c472536..7a95b70 100644
--- a/wifi/java/android/net/wifi/ScanResult.java
+++ b/wifi/java/android/net/wifi/ScanResult.java
@@ -338,6 +338,7 @@
dest.writeInt(untrusted ? 1 : 0);
dest.writeInt(numConnection);
dest.writeInt(numUsage);
+ dest.writeInt(numIpConfigFailures);
if (passpoint != null) {
dest.writeInt(1);
passpoint.writeToParcel(dest, flags);
@@ -379,6 +380,7 @@
sr.untrusted = in.readInt() != 0;
sr.numConnection = in.readInt();
sr.numUsage = in.readInt();
+ sr.numIpConfigFailures = in.readInt();
if (in.readInt() == 1) {
sr.passpoint = WifiPasspointInfo.CREATOR.createFromParcel(in);
}