Merge "Add null check to getConfigForHostname"

am: fe1eac7a19

* commit 'fe1eac7a19b827af71c503df6aefc59076a30928':
  Add null check to getConfigForHostname

1 files changed, 1 insertions, 1 deletions

diff --git a/core/java/android/security/net/config/ApplicationConfig.java b/core/java/android/security/net/config/ApplicationConfig.java
index b6276418c49d..71d9d5d0e04d 100644
--- 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) ==  '.') {