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

Merge "Add null check to getConfigForHostname"

Browse Source 
am: fe1eac7a19

* commit 'fe1eac7a19b827af71c503df6aefc59076a30928':
  Add null check to getConfigForHostname
This commit is contained in:
Chad Brubaker
2015-12-11 10:16:26 -08:00
committed by android-build-merger
parent ba6295d8ed fe1eac7a19
commit 14cf68c284
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/security/net/config/ApplicationConfig.java
View File

@@ -68,7 +68,7 @@ public final class ApplicationConfig {
*/ */
public NetworkSecurityConfig getConfigForHostname(String hostname) { public NetworkSecurityConfig getConfigForHostname(String hostname) {
ensureInitialized(); ensureInitialized();
if (hostname.isEmpty() || mConfigs == null) { if (hostname == null || hostname.isEmpty() || mConfigs == null) {
return mDefaultConfig; return mDefaultConfig;
} }
if (hostname.charAt(0) == '.') { if (hostname.charAt(0) == '.') {