diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-03 22:47:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-03-03 22:47:13 +0000 |
| commit | d1bb750eca32bf03261b08c8faf21bf621907340 (patch) | |
| tree | 48b6f996a73ee98a50f2a174b49b1ae55fb36765 | |
| parent | b76b388fd7c75e2dc93c8089c6389bdc18658631 (diff) | |
| parent | a78ebdcf1589a306f2127201e2e2e04f057dffe9 (diff) | |
| download | cts-d1bb750eca32bf03261b08c8faf21bf621907340.tar.gz | |
Merge "Fix screen brightness"
| -rw-r--r-- | hostsidetests/statsdatom/apps/statsdapp/src/com/android/server/cts/device/statsdatom/AtomTests.java | 2 | ||||
| -rw-r--r-- | hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/UidAtomTests.java | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/hostsidetests/statsdatom/apps/statsdapp/src/com/android/server/cts/device/statsdatom/AtomTests.java b/hostsidetests/statsdatom/apps/statsdapp/src/com/android/server/cts/device/statsdatom/AtomTests.java index ab4315159e1..923817f89f9 100644 --- a/hostsidetests/statsdatom/apps/statsdapp/src/com/android/server/cts/device/statsdatom/AtomTests.java +++ b/hostsidetests/statsdatom/apps/statsdapp/src/com/android/server/cts/device/statsdatom/AtomTests.java @@ -681,8 +681,6 @@ public class AtomTests { sleep(500); setScreenBrightness(100); sleep(500); - setScreenBrightness(140); - sleep(500); wl.release(); diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/UidAtomTests.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/UidAtomTests.java index 0a00c678c55..9a0312599b7 100644 --- a/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/UidAtomTests.java +++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/UidAtomTests.java @@ -637,11 +637,9 @@ public class UidAtomTests extends DeviceTestCase implements IBuildReceiver { Set<Integer> screenMin = new HashSet<>(Arrays.asList(47)); Set<Integer> screen100 = new HashSet<>(Arrays.asList(100)); - Set<Integer> screen140 = new HashSet<>(Arrays.asList(140)); - // Set<Integer> screenMax = new HashSet<>(Arrays.asList(255)); // Add state sets to the list in order. - List<Set<Integer>> stateSet = Arrays.asList(screenMin, screen100, screen140); + List<Set<Integer>> stateSet = Arrays.asList(screenMin, screen100); ConfigUtils.uploadConfigForPushedAtom(getDevice(), DeviceUtils.STATSD_ATOM_TEST_PKG, atomTag); @@ -656,7 +654,7 @@ public class UidAtomTests extends DeviceTestCase implements IBuildReceiver { AtomTestUtils.popUntilFind(data, screenMin, atom -> atom.getScreenBrightnessChanged().getLevel()); - AtomTestUtils.popUntilFindFromEnd(data, screen140, + AtomTestUtils.popUntilFindFromEnd(data, screen100, atom -> atom.getScreenBrightnessChanged().getLevel()); // Assert that the events happened in the expected order. AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT, |