Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE issues seen by CTS" into jb-mr2-dev

Browse Source
This commit is contained in:
Irfan Sheriff
2013-04-19 19:43:46 +00:00
committed by Android (Google) Code Review
parent e37c8f781a 0b4732c224
commit 4a1d95139a
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wifi/java/android/net/wifi/WifiEnterpriseConfig.java
View File

@@ -412,10 +412,14 @@ public class WifiEnterpriseConfig implements Parcelable {
* @throws IllegalArgumentException if not a CA certificate * @throws IllegalArgumentException if not a CA certificate
*/ */
public void setCaCertificate(X509Certificate cert) { public void setCaCertificate(X509Certificate cert) {
if (cert.getBasicConstraints() >= 0) { if (cert != null) {
mCaCert = cert; if (cert.getBasicConstraints() >= 0) {
mCaCert = cert;
} else {
throw new IllegalArgumentException("Not a CA certificate");
}
} else { } else {
throw new IllegalArgumentException("Not a CA certificate"); mCaCert = null;
} }
} }
@@ -679,6 +683,7 @@ public class WifiEnterpriseConfig implements Parcelable {
} }
private String removeDoubleQuotes(String string) { private String removeDoubleQuotes(String string) {
if (TextUtils.isEmpty(string)) return "";
int length = string.length(); int length = string.length();
if ((length > 1) && (string.charAt(0) == '"') if ((length > 1) && (string.charAt(0) == '"')
&& (string.charAt(length - 1) == '"')) { && (string.charAt(length - 1) == '"')) {