PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wi-Fi DPP code refine

Browse Source 
1. call Activity#setResult only for RESULT_OK case
2. refine @VisibleForTesting usage
     remove redundant assignment otherwise = PRIVATE
     set all @VisibleForTesting annotated methods package scope
3. rename WifiQrCode#SECURITY_WPA to WifiQrCode#SECURITY_WPA_PSK

Bug: 120645817
Test: atest WifiQrCodeTest
      atest WifiDppConfiguratorActivityTest
      atest WifiDppEnrolleeActivityTest
      atest WifiDppQrCodeGeneratorFragmentTest
      atest WifiDppQrCodeScannerFragmentTest
      atest WifiNetworkListFragmentTest
      atest WifiDppChooseSavedWifiNetworkFragmentTest

Change-Id: Id5de7eadc73185716422fc0d197f82bdd025ce45
This commit is contained in:
Arc Wang
2019-01-25 14:12:03 +08:00
parent 4ab826ac5b
commit 8de242ada6
8 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/wifi/dpp/WifiQrCode.java
View File

@@ -66,7 +66,7 @@ public class WifiQrCode {
// Ignores password if security is SECURITY_NO_PASSWORD or absent
public static final String SECURITY_NO_PASSWORD = "nopass";
public static final String SECURITY_WEP = "WEP";
public static final String SECURITY_WPA = "WPA";
public static final String SECURITY_WPA_PSK = "WPA";
public static final String SECURITY_SAE = "WPA3";
private String mQrCode;
@@ -169,8 +169,8 @@ public class WifiQrCode {
return null;
}
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
protected String removeBackSlash(String input) {
@VisibleForTesting
String removeBackSlash(String input) {
if (input == null) {
return null;
}
@@ -210,8 +210,8 @@ public class WifiQrCode {
}
/** Available when {@code getScheme()} returns SCHEME_DPP */
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
protected String getPublicKey() {
@VisibleForTesting
String getPublicKey() {
return mPublicKey;
}