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

Merge "Fix array-related errorprone warnings" am: a93e78f781 am: a89e7aea3b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2183972

Change-Id: Iac4c2bea65889fbb3847794fc7a8b1d23ff2f9b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2022-08-17 19:44:42 +00:00
committed by Automerger Merge Worker
parent 56c191d288 a89e7aea3b
commit cdacabf984
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -746,7 +746,7 @@ public class WifiConfigController implements TextWatcher,
if (config.enterpriseConfig.getCaCertificateAliases() != null
&& config.enterpriseConfig.getCaPath() != null) {
Log.e(TAG, "ca_cert ("
+ config.enterpriseConfig.getCaCertificateAliases()
+ Arrays.toString(config.enterpriseConfig.getCaCertificateAliases())
+ ") and ca_path ("
+ config.enterpriseConfig.getCaPath()
+ ") should not both be non-null");

2
src/com/android/settings/wifi/WifiConfigController2.java
View File

@@ -737,7 +737,7 @@ public class WifiConfigController2 implements TextWatcher,
if (config.enterpriseConfig.getCaCertificateAliases() != null
&& config.enterpriseConfig.getCaPath() != null) {
Log.e(TAG, "ca_cert ("
+ config.enterpriseConfig.getCaCertificateAliases()
+ Arrays.toString(config.enterpriseConfig.getCaCertificateAliases())
+ ") and ca_path ("
+ config.enterpriseConfig.getCaPath()
+ ") should not both be non-null");