| Index: base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java
|
| diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java b/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java
|
| index 761ceabf37f16114019249164d6b1096c93e9414..9fa7d82ff85775b8ed7b5a705f1ab9aff5a37155 100644
|
| --- a/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java
|
| +++ b/base/test/android/javatests/src/org/chromium/base/test/util/DisableIfSkipCheck.java
|
| @@ -10,7 +10,6 @@ import junit.framework.TestCase;
|
|
|
| import org.chromium.base.Log;
|
|
|
| -import java.lang.reflect.AnnotatedElement;
|
| import java.lang.reflect.Method;
|
| import java.util.Arrays;
|
|
|
| @@ -28,16 +27,12 @@ public class DisableIfSkipCheck extends SkipCheck {
|
| Method method = getTestMethod(testCase);
|
| if (method == null) return true;
|
|
|
| - if (((AnnotatedElement) method).isAnnotationPresent(DisableIf.Build.class)) {
|
| - DisableIf.Build v = method.getAnnotation(DisableIf.Build.class);
|
| -
|
| + for (DisableIf.Build v : getAnnotations(method, DisableIf.Build.class)) {
|
| if (abi(v) && hardware(v) && sdk(v)) {
|
| if (!v.message().isEmpty()) {
|
| Log.i(TAG, "%s is disabled: %s", testCase.toString(), v.message());
|
| }
|
| return true;
|
| - } else {
|
| - return false;
|
| }
|
| }
|
|
|
|
|