From 0b4732c2248fa2b92a44f045dfcadb3547076ef4 Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Fri, 19 Apr 2013 10:43:40 -0700 Subject: [PATCH] Fix NPE issues seen by CTS Bug: 8646305 Change-Id: Ief90c76d63f60aee9a3da080cd43dd9610f3f4fc --- wifi/java/android/net/wifi/WifiEnterpriseConfig.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java index f8a81968b5910..daa04a473d348 100644 --- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java +++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java @@ -417,10 +417,14 @@ public class WifiEnterpriseConfig implements Parcelable { * @throws IllegalArgumentException if not a CA certificate */ public void setCaCertificate(X509Certificate cert) { - if (cert.getBasicConstraints() >= 0) { - mCaCert = cert; + if (cert != null) { + if (cert.getBasicConstraints() >= 0) { + mCaCert = cert; + } else { + throw new IllegalArgumentException("Not a CA certificate"); + } } else { - throw new IllegalArgumentException("Not a CA certificate"); + mCaCert = null; } } @@ -683,6 +687,7 @@ public class WifiEnterpriseConfig implements Parcelable { } private String removeDoubleQuotes(String string) { + if (TextUtils.isEmpty(string)) return ""; int length = string.length(); if ((length > 1) && (string.charAt(0) == '"') && (string.charAt(length - 1) == '"')) {