Merge "Add null check to getConfigForHostname"

2015-12-11 18:02:34 +00:00
parent 7e4d92fbc7 9613157d5e
commit fe1eac7a19
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/security/net/config/ApplicationConfig.java
+++ b/core/java/android/security/net/config/ApplicationConfig.java
@@ -68,7 +68,7 @@ public final class ApplicationConfig {
     */
    public NetworkSecurityConfig getConfigForHostname(String hostname) {
        ensureInitialized();
-        if (hostname.isEmpty() || mConfigs == null) {
+        if (hostname == null || hostname.isEmpty() || mConfigs == null) {
            return mDefaultConfig;
        }
        if (hostname.charAt(0) ==  '.') {