Merge "Fix incorrect hasPerDomainConfigs check"

2015-11-06 21:02:01 +00:00
parent 7e98f2e697 35de8d6d2b
commit c5c51dafb3
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
@@ -48,7 +48,7 @@ public final class ApplicationConfig {
     */
    public boolean hasPerDomainConfigs() {
        ensureInitialized();
-        return mConfigs == null || !mConfigs.isEmpty();
+        return mConfigs != null && !mConfigs.isEmpty();
    }

    /**