From b4d39a8321a9c8f318ec157d7e3fd5b3725bd11c Mon Sep 17 00:00:00 2001 From: Nate Jiang Date: Thu, 3 Sep 2020 13:11:00 -0700 Subject: DeserializeData for new device without userDataStore Even new device without userDataStore, still do the deserialize to make the mUserDataLoaded flag to TRUE. Bug: 167647087 Test: atest com.android.server.wifi Merged-In: I16be0a27e2b3d7128dce64ce09c9143bd605f991 Change-Id: I16be0a27e2b3d7128dce64ce09c9143bd605f991 (cherry picked from commit 7a098b760707a5c55675e597d4bb4349e8511df5) --- .../android/server/wifi/ImsiPrivacyProtectionExemptionStoreData.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'service') diff --git a/service/java/com/android/server/wifi/ImsiPrivacyProtectionExemptionStoreData.java b/service/java/com/android/server/wifi/ImsiPrivacyProtectionExemptionStoreData.java index 98664d0fc..a9c99ae54 100644 --- a/service/java/com/android/server/wifi/ImsiPrivacyProtectionExemptionStoreData.java +++ b/service/java/com/android/server/wifi/ImsiPrivacyProtectionExemptionStoreData.java @@ -28,6 +28,7 @@ import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; import java.io.IOException; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -92,6 +93,7 @@ public class ImsiPrivacyProtectionExemptionStoreData implements WifiConfigStore. throws XmlPullParserException, IOException { // Ignore empty reads. if (in == null) { + mDataSource.fromDeserialized(Collections.emptyMap()); return; } -- cgit v1.2.3