Merge "Fix incorrect hasPerDomainConfigs check" am: c5c51dafb3

am: dd6d0918c4 * commit 'dd6d0918c42aec3fb08d6df15822078e35cc4f33': Fix incorrect hasPerDomainConfigs check
2015-11-06 21:17:34 +00:00
parent 54b4b8fdfc dd6d0918c4
commit a21b4a528d
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();
    }

    /**