commit fe1eac7a19b827af71c503df6aefc59076a30928
author Chad Brubaker <cbrubaker@google.com> Fri Dec 11 18:02:34 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 11 18:02:34 2015 +0000
tree 54b2ae4701683dc37b501ea045e4d713500a0c0d
parent 7e4d92fbc7761d561c1bc61dc5cf55b69d3a54f3
parent 9613157d5efd09be07a0074a0122dd69265ca70f

Merge "Add null check to getConfigForHostname"

core/java/android/security/net/config/ApplicationConfig.java

diff --git a/core/java/android/security/net/config/ApplicationConfig.java b/core/java/android/security/net/config/ApplicationConfig.java
index b627641..71d9d5d 100644
--- a/core/java/android/security/net/config/ApplicationConfig.java
+++ b/core/java/android/security/net/config/ApplicationConfig.java
@@ -68,7 +68,7 @@
      */
     public NetworkSecurityConfig getConfigForHostname(String hostname) {
         ensureInitialized();
-        if (hostname.isEmpty() || mConfigs == null) {
+        if (hostname == null || hostname.isEmpty() || mConfigs == null) {
             return mDefaultConfig;
         }
         if (hostname.charAt(0) ==  '.') {