Exclude implicit MO creation when creating Hotspot 2.0 release 2 networks.

Bug=27294473

Change-Id: I8f13cd49e8b2d17e9451625ab1b01dd16c057f2e

1 files changed, 13 insertions, 11 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index 2a0a14a25..3e4a95d05 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -3340,19 +3340,21 @@ public class WifiConfigStore extends IpConfigStore {
 
         if (!existingMO && config.isPasspoint()) {
             try {
-                Credential credential =
-                        new Credential(config.enterpriseConfig, mKeyStore, !newNetwork);
-                HashSet<Long> roamingConsortiumIds = new HashSet<Long>();
-                for (Long roamingConsortiumId : config.roamingConsortiumIds) {
-                    roamingConsortiumIds.add(roamingConsortiumId);
-                }
+                if (config.updateIdentifier == null) {   // Only create an MO for r1 networks
+                    Credential credential =
+                            new Credential(config.enterpriseConfig, mKeyStore, !newNetwork);
+                    HashSet<Long> roamingConsortiumIds = new HashSet<Long>();
+                    for (Long roamingConsortiumId : config.roamingConsortiumIds) {
+                        roamingConsortiumIds.add(roamingConsortiumId);
+                    }
 
-                homeSP = new HomeSP(Collections.<String, Long>emptyMap(), config.FQDN,
-                        roamingConsortiumIds, Collections.<String>emptySet(),
-                        Collections.<Long>emptySet(), Collections.<Long>emptyList(),
-                        config.providerFriendlyName, null, credential);
+                    homeSP = new HomeSP(Collections.<String, Long>emptyMap(), config.FQDN,
+                            roamingConsortiumIds, Collections.<String>emptySet(),
+                            Collections.<Long>emptySet(), Collections.<Long>emptyList(),
+                            config.providerFriendlyName, null, credential);
 
-                log("created a homeSP object for " + config.networkId + ":" + config.SSID);
+                    log("created a homeSP object for " + config.networkId + ":" + config.SSID);
+                }
 
                 /* fix enterprise config properties for passpoint */
                 currentConfig.enterpriseConfig.setRealm(config.enterpriseConfig.getRealm());