diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-17 00:10:45 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-17 00:10:45 +0000 |
commit | d5f40d3862d639684672bdba709ca598c9d0e248 (patch) | |
tree | 8bb3ec31fbb2e671d51aef48afdc9a1ed6b3fe8a /tests/wifitests/src/com/android/server/wifi/RandomizedMacStoreDataTest.java | |
parent | 7ebfe807c4ef8c41ea13fca1cb844c0f3b6e8fb4 (diff) | |
parent | a9ebe48227eb5befd221451a013cbd0a76eac999 (diff) | |
download | android_frameworks_opt_net_wifi-d5f40d3862d639684672bdba709ca598c9d0e248.tar.gz android_frameworks_opt_net_wifi-d5f40d3862d639684672bdba709ca598c9d0e248.tar.bz2 android_frameworks_opt_net_wifi-d5f40d3862d639684672bdba709ca598c9d0e248.zip |
Snap for 6013205 from a9ebe48227eb5befd221451a013cbd0a76eac999 to qt-qpr2-release
Change-Id: I16793ede4d0cdb517d5c7a546476eb36c10da8e3
Diffstat (limited to 'tests/wifitests/src/com/android/server/wifi/RandomizedMacStoreDataTest.java')
-rw-r--r-- | tests/wifitests/src/com/android/server/wifi/RandomizedMacStoreDataTest.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/RandomizedMacStoreDataTest.java b/tests/wifitests/src/com/android/server/wifi/RandomizedMacStoreDataTest.java index 4df560fd2..cdd4e6c84 100644 --- a/tests/wifitests/src/com/android/server/wifi/RandomizedMacStoreDataTest.java +++ b/tests/wifitests/src/com/android/server/wifi/RandomizedMacStoreDataTest.java @@ -24,6 +24,7 @@ import android.util.Xml; import androidx.test.filters.SmallTest; import com.android.internal.util.FastXmlSerializer; +import com.android.server.wifi.util.WifiConfigStoreEncryptionUtil; import org.junit.Before; import org.junit.Test; @@ -62,7 +63,7 @@ public class RandomizedMacStoreDataTest { final XmlSerializer out = new FastXmlSerializer(); final ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); out.setOutput(outputStream, StandardCharsets.UTF_8.name()); - mRandomizedMacStoreData.serializeData(out); + mRandomizedMacStoreData.serializeData(out, mock(WifiConfigStoreEncryptionUtil.class)); out.flush(); return outputStream.toByteArray(); } @@ -78,7 +79,9 @@ public class RandomizedMacStoreDataTest { final XmlPullParser in = Xml.newPullParser(); final ByteArrayInputStream inputStream = new ByteArrayInputStream(data); in.setInput(inputStream, StandardCharsets.UTF_8.name()); - mRandomizedMacStoreData.deserializeData(in, in.getDepth()); + mRandomizedMacStoreData.deserializeData(in, in.getDepth(), + WifiConfigStore.ENCRYPT_CREDENTIALS_CONFIG_STORE_DATA_VERSION, + mock(WifiConfigStoreEncryptionUtil.class)); return mRandomizedMacStoreData.getMacMapping(); } |