Merge "[Passpoint] Pass creator uid and package name to WifiConfigManager" into rvc-dev am: cc199fa694

Change-Id: If56a968e70ddb51736991eb1bbb1af13a085b819

1 files changed, 3 insertions, 7 deletions

diff --git a/service/java/com/android/server/wifi/hotspot2/PasspointNetworkNominateHelper.java b/service/java/com/android/server/wifi/hotspot2/PasspointNetworkNominateHelper.java
index 22ce2f07a..0a5da1f7c 100644
--- a/service/java/com/android/server/wifi/hotspot2/PasspointNetworkNominateHelper.java
+++ b/service/java/com/android/server/wifi/hotspot2/PasspointNetworkNominateHelper.java
@@ -204,13 +204,9 @@ public class PasspointNetworkNominateHelper {
         // Add or update with the newly created WifiConfiguration to WifiConfigManager.
         // NOTE: if existingNetwork != null, this update is a no-op in most cases if the SSID is the
         // same (since we update the cached config in PasspointManager#addOrUpdateProvider().
-        NetworkUpdateResult result;
-        if (config.fromWifiNetworkSuggestion) {
-            result = mWifiConfigManager.addOrUpdateNetwork(
-                    config, config.creatorUid, config.creatorName);
-        } else {
-            result = mWifiConfigManager.addOrUpdateNetwork(config, Process.WIFI_UID);
-        }
+        NetworkUpdateResult result = mWifiConfigManager.addOrUpdateNetwork(
+                config, config.creatorUid, config.creatorName);
+
         if (!result.isSuccess()) {
             mLocalLog.log("Failed to add passpoint network");
             return existingNetwork;