summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuang Luong <qal@google.com>2023-05-04 21:10:55 +0000
committerQuang Luong <qal@google.com>2023-05-04 21:10:55 +0000
commit87de607e6d9ad5a92efab17f288b06c8238c86cb (patch)
tree969f21bdf5f06044f20cad05bc4895f345caa3b5
parente4f23a83e16870cb22bd3bd96c76dfe4a9172dc6 (diff)
downloadwifi-87de607e6d9ad5a92efab17f288b06c8238c86cb.tar.gz
Fix NPE when checking CA cert aliases
Bug: 279474188 Test: atest SavedNetworkTrackerTest Change-Id: I7b33aa77adb344b730fef992c18189c96ad257d6
-rw-r--r--libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java
index 20f5fac25..cf6288a2f 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/SavedNetworkTracker.java
@@ -170,9 +170,11 @@ public class SavedNetworkTracker extends BaseWifiTracker {
}
String[] aliases = ec.getCaCertificateAliases();
- for (String s: aliases) {
- if (!TextUtils.isEmpty(s) && certAlias.equals(s)) {
- return true;
+ if (aliases != null) {
+ for (String s: aliases) {
+ if (!TextUtils.isEmpty(s) && certAlias.equals(s)) {
+ return true;
+ }
}
}
String clientAlias = ec.getClientCertificateAlias();