Merge "Fix incorrect hasPerDomainConfigs check"

am: c5c51dafb3 * commit 'c5c51dafb3ede95622eb350dae0b662abb611925': Fix incorrect hasPerDomainConfigs check
2015-11-06 21:09:11 +00:00
parent 478fad3cf5 c5c51dafb3
commit dd6d0918c4
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();
    }

    /**