WifiBackupRestore: Logging changes

Changes in CL:
1. To reduce log spamming, dump out the raw backup data only in
bugreports if verbose logging is enabled.
2. Mask out the passwords from the backup data dump.
3. Move WifiBackupRestore module initialization to |WifiInjector| so
that |WifiStateMachine| can set the verbose loging level.
4. Cleanup some unused variables in |SupplicantNework| class.

BUG: 29051876
Change-Id: I6b58136057549ba1eb8a2845341be9fa072572b4
TEST: Manual tests

1 files changed, 29 insertions, 1 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java b/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java
index 31905fb8a..518d1cb7b 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiBackupRestoreTest.java
@@ -30,12 +30,17 @@ import android.util.Log;
 
 import com.android.server.net.IpConfigStore;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
+import java.io.FileDescriptor;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -69,8 +74,27 @@ public class WifiBackupRestoreTest {
     private static final String TEST_STATIC_PROXY_EXCLUSION_LIST = "";
     private static final String TEST_PAC_PROXY_LOCATION = "http://";
 
-
     private final WifiBackupRestore mWifiBackupRestore = new WifiBackupRestore();
+    private boolean mCheckDump = true;
+
+    @Before
+    public void setUp() throws Exception {
+        // Enable verbose logging before tests to check the backup data dumps.
+        mWifiBackupRestore.enableVerboseLogging(1);
+    }
+
+    @After
+    public void cleanUp() throws Exception {
+        if (mCheckDump) {
+            StringWriter stringWriter = new StringWriter();
+            mWifiBackupRestore.dump(
+                    new FileDescriptor(), new PrintWriter(stringWriter), new String[0]);
+            // Ensure that the SSID was dumped out.
+            assertTrue(stringWriter.toString().contains(TEST_SSID));
+            // Ensure that the password wasn't dumped out.
+            assertFalse(stringWriter.toString().contains(TEST_PSK));
+        }
+    }
 
     /**
      * Verify that a single open network configuration is serialized & deserialized correctly.
@@ -155,6 +179,8 @@ public class WifiBackupRestoreTest {
         List<WifiConfiguration> retrievedConfigurations =
                 mWifiBackupRestore.retrieveConfigurationsFromBackupData(backupData);
         assertTrue(retrievedConfigurations.isEmpty());
+        // No valid data to check in dump.
+        mCheckDump = false;
     }
 
     /**
@@ -435,6 +461,8 @@ public class WifiBackupRestoreTest {
         List<WifiConfiguration> retrievedConfigurations =
                 mWifiBackupRestore.retrieveConfigurationsFromBackupData(backupData);
         assertNull(retrievedConfigurations);
+        // No valid data to check in dump.
+        mCheckDump = false;
     }
 
     private WifiConfiguration createOpenNetwork(int id) {