From 834b0ade20ad8b65abfa50b3fa38965eabe4b818 Mon Sep 17 00:00:00 2001
From: Quang Luong <qal@google.com>
Date: Fri, 28 Feb 2020 12:51:03 -0800
Subject: [PATCH] [WifiSettings2] Remove redundant save() call for new configs

Removing call to WifiManager#save() when configuring a new network
through tapping it in the wifi picker. Since WifiManager#connect()
already saves the passed in WifiConfiguration, the call to
WifiManager#save() is redundant.

Bug: 149579116
Test: build, manual verification by connecting to a new secure network
Change-Id: I9242e7fd7e9a459e8221b6bb491ab67833970e87
---
 .../android/settings/wifi/WifiSettings2.java  | 27 ++-----------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java
index 1b3a7313fc8..f88a4df9d0a 100644
--- a/src/com/android/settings/wifi/WifiSettings2.java
+++ b/src/com/android/settings/wifi/WifiSettings2.java
@@ -423,8 +423,8 @@ public class WifiSettings2 extends RestrictedSettingsFragment
                 final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
                         ConfigureWifiEntryFragment.NETWORK_CONFIG_KEY);
                 if (wifiConfiguration != null) {
-                    mWifiManager.save(wifiConfiguration,
-                            new WifiSaveThenConnectActionListener(wifiConfiguration));
+                    mWifiManager.connect(wifiConfiguration,
+                            new WifiConnectActionListener());
                 }
             }
             return;
@@ -970,29 +970,6 @@ public class WifiSettings2 extends RestrictedSettingsFragment
                 fullScreenEdit));
     }
 
-    private class WifiSaveThenConnectActionListener implements WifiManager.ActionListener {
-        final WifiConfiguration mWifiConfiguration;
-
-        WifiSaveThenConnectActionListener(WifiConfiguration wifiConfiguration) {
-            mWifiConfiguration = wifiConfiguration;
-        }
-
-        @Override
-        public void onSuccess() {
-            mWifiManager.connect(mWifiConfiguration, new WifiConnectActionListener());
-        }
-
-        @Override
-        public void onFailure(int reason) {
-            final Activity activity = getActivity();
-            if (isFisishingOrDestroyed(activity)) {
-                return;
-            }
-
-            Toast.makeText(activity, R.string.wifi_failed_save_message, Toast.LENGTH_SHORT).show();
-        }
-    };
-
     private class WifiConnectActionListener implements WifiManager.ActionListener {
         @Override
         public void onSuccess() {