| commit | b144c1fc9fa9b07b61327dfca6305e2878adf237 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Fri Aug 03 19:28:13 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Aug 03 19:28:13 2018 +0000 |
| tree | d3852ba35e2681b1c16cb5cca1f0dea4ea720ac1 | |
| parent | bc4c5961b7ef0465a5a5d4a1c2945432f2586501 [diff] | |
| parent | 07ffaaebc0f3397ba92ed5f995a471685dd92152 [diff] |
Merge "Update watchdogd path"
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/companion/CompanionDeviceTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/companion/CompanionDeviceTestActivity.java index 2661d42..95c99b7 100644 --- a/apps/CtsVerifier/src/com/android/cts/verifier/companion/CompanionDeviceTestActivity.java +++ b/apps/CtsVerifier/src/com/android/cts/verifier/companion/CompanionDeviceTestActivity.java
@@ -31,10 +31,13 @@ import java.util.List; +import com.android.compatibility.common.util.CddTest; + /** * Test that checks that the {@link CompanionDeviceManager} API is functional */ +@CddTest(requirement="3.16/C-1-2,C-1-3,H-1-1") public class CompanionDeviceTestActivity extends PassFailButtons.Activity { private static final String LOG_TAG = "CompanionDeviceTestActi";
diff --git a/tests/tests/systemui/src/android/systemui/cts/LightBarTests.java b/tests/tests/systemui/src/android/systemui/cts/LightBarTests.java index eccb16d..e38ff52 100644 --- a/tests/tests/systemui/src/android/systemui/cts/LightBarTests.java +++ b/tests/tests/systemui/src/android/systemui/cts/LightBarTests.java
@@ -261,7 +261,7 @@ float eps = 0.005f; for (int c : pixels) { - if (c == background) { + if (isColorSame(c, background)) { s.backgroundPixels++; continue; }