From 39cc315273a2216e5947a1dd856b04dd8b67beb4 Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Wed, 22 Apr 2020 13:50:15 -0700 Subject: [PATCH] Fix Error Prone errors Soong wasn't including android_app or android_test sources in the javac-check target used for the Error Prone build, which allowed some Error Prone errors to get in. Fix them so Error Prone can be re-enabled for these targets. Fixes: cts/hostsidetests/net/app/src/com/android/cts/net/hostside/RequiredPropertiesRule.java:61: error: [CollectionIncompatibleType] Argument '~requiredProperty.getValue()' should not be passed to this method; its type int is not compatible with its collection's type argument Property Bug: 146455923 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: I7c5bf823bf371902285ce3ee3929796fa40c653b Merged-In: I48b1ccb61c807d0b41a165298ef5981258d6656e --- .../android/cts/net/hostside/RequiredPropertiesRule.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/RequiredPropertiesRule.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/RequiredPropertiesRule.java index 1e333200db..98c97c5687 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/RequiredPropertiesRule.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/RequiredPropertiesRule.java @@ -58,8 +58,12 @@ public class RequiredPropertiesRule extends BeforeAfterRule { continue; } for (Property requiredProperty : requiredProperties.value()) { - if (!allRequiredProperties.contains(~requiredProperty.getValue())) { - allRequiredProperties.add(requiredProperty); + for (Property p : Property.values()) { + if (p.getValue() == ~requiredProperty.getValue()) { + if (!allRequiredProperties.contains(p)) { + allRequiredProperties.add(requiredProperty); + } + } } } }