Remove redundant checks in CompatChangeRule

Checking for overlap between enabled and disabled changes is redundant,
as the check occurs already in the Compatibility.ChangeConfig
constructor.

Bug: 140367850
Test: http://aosp/1113771
Change-Id: I87526076a58bd33e733eb2bfff95d33822fffc87

1 files changed, 4 insertions, 9 deletions

diff --git a/test-rules/src/platform_compat/java/android/compat/CompatChangeRule.java b/test-rules/src/platform_compat/java/android/compat/CompatChangeRule.java
index 2586f9c9e2..1bae1a2c31 100644
--- a/test-rules/src/platform_compat/java/android/compat/CompatChangeRule.java
+++ b/test-rules/src/platform_compat/java/android/compat/CompatChangeRule.java
@@ -86,17 +86,12 @@ public class CompatChangeRule implements TestRule {
         if (disableCompatChanges != null) {
             disabled.addAll(Longs.asList(disableCompatChanges.value()));
         }
-        ArraySet<Long> intersection = new ArraySet<>(enabled);
-        intersection.retainAll(disabled);
-        if (!intersection.isEmpty()) {
-            throw new IllegalArgumentException(
-                    "Changes " + intersection + " are both enabled and disabled.");
-        }
-        if (enabled.isEmpty() && disabled.isEmpty()) {
-            throw new IllegalStateException("Added a CompatChangeRule without specifying any "
+        ChangeConfig config = new ChangeConfig(enabled, disabled);
+        if (config.isEmpty()) {
+            throw new IllegalArgumentException("Added a CompatChangeRule without specifying any "
                 + "@EnableCompatChanges or @DisableCompatChanges !");
         }
-        return new CompatChangeStatement(statement, new ChangeConfig(enabled, disabled));
+        return new CompatChangeStatement(statement, config);
     }
 
     private static class CompatChangeStatement extends Statement {