From 018e39e2f6201519373e7f4dbb1427f0e5274898 Mon Sep 17 00:00:00 2001
From: Peter Qiu <zqiu@google.com>
Date: Fri, 10 Mar 2017 13:50:46 -0800
Subject: WifiConfigMangaer: use updated legacy Passpoint config indicator

Bug: 36101691
Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Change-Id: I85cd5619072ec978913df932c0b47ebe696074bc
---
 tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java   | 1 +
 .../wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java | 1 +
 2 files changed, 2 insertions(+)

(limited to 'tests')

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
index 5c78d0de3..61c74180e 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
@@ -2113,6 +2113,7 @@ public class WifiConfigManagerTest {
         final WifiConfiguration passpointConfig =
                 WifiConfigurationTestUtil.createPasspointNetwork();
         passpointConfig.creatorUid = UserHandle.getUid(user1, appId);
+        passpointConfig.isLegacyPasspointConfig = true;
 
         // Set up the shared store data to contain one legacy Passpoint configuration.
         List<WifiConfiguration> sharedNetworks = new ArrayList<WifiConfiguration>() {
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java
index d30ad57de..4b4e875a1 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigStoreLegacyTest.java
@@ -142,6 +142,7 @@ public class WifiConfigStoreLegacyTest {
         WifiConfigStoreLegacy.WifiConfigStoreDataLegacy storeData = mWifiConfigStore.read();
 
         // Update the expected configuration for Passpoint network.
+        passpointNetwork.isLegacyPasspointConfig = true;
         passpointNetwork.FQDN = fqdn;
         passpointNetwork.providerFriendlyName = providerFriendlyName;
         passpointNetwork.roamingConsortiumIds = roamingConsortiumIds;
-- 
cgit v1.2.3