diff options
| author | Nate Jiang <qiangjiang@google.com> | 2020-07-24 11:53:03 -0700 |
|---|---|---|
| committer | Nate Jiang <qiangjiang@google.com> | 2020-07-29 22:24:40 +0000 |
| commit | a03bcee78325faf5523d90ee7a7f927b49b65fb0 (patch) | |
| tree | 214f2d3580a173f2a34d1de7cf581f206f439e20 /wifi/java | |
| parent | 33705e3d55807611453b7f3159b4780355d0e959 (diff) | |
[NetworkSuggestion] Fix getEnterpriseConfig
Return null when getEnterpriseConfig() on a non enterprise WifiConfig.
Bug: 162031037
Test: atest android.net.wifi
Merged-In: I874b2f99fef693b34bad4b075eed595a0d89f392
Change-Id: I874b2f99fef693b34bad4b075eed595a0d89f392
(cherry picked from commit 1312174396fdccf4c731e81ddd026ec2e384114e)
Diffstat (limited to 'wifi/java')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiNetworkSuggestion.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/WifiNetworkSuggestion.java b/wifi/java/android/net/wifi/WifiNetworkSuggestion.java index 4d3a2c02c686..68eb1bbd8a79 100644 --- a/wifi/java/android/net/wifi/WifiNetworkSuggestion.java +++ b/wifi/java/android/net/wifi/WifiNetworkSuggestion.java @@ -943,6 +943,9 @@ public final class WifiNetworkSuggestion implements Parcelable { */ @Nullable public WifiEnterpriseConfig getEnterpriseConfig() { + if (!wifiConfiguration.isEnterprise()) { + return null; + } return wifiConfiguration.enterpriseConfig; } |