From 1e586fc03a42aea75791716ae318753b613c03ff Mon Sep 17 00:00:00 2001 From: heliang huang Date: Mon, 22 Jun 2020 15:56:07 +0800 Subject: Skip cts test:testDeviceCalculatedPowerBlameUid Linux does not support the node /proc/uid_time_state in kernel3.18.skip related CTS test in this version. Bug: 176810466 Test: TH Change-Id: I466feb0b5984cb3642eea54509aff0e4fc5b1074 Merged-In: I466feb0b5984cb3642eea54509aff0e4fc5b1074 --- hostsidetests/statsd/src/android/cts/statsd/atom/UidAtomTests.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hostsidetests/statsd/src/android/cts/statsd/atom/UidAtomTests.java b/hostsidetests/statsd/src/android/cts/statsd/atom/UidAtomTests.java index 7971e20abfe..c6e5a6368bd 100644 --- a/hostsidetests/statsd/src/android/cts/statsd/atom/UidAtomTests.java +++ b/hostsidetests/statsd/src/android/cts/statsd/atom/UidAtomTests.java @@ -419,6 +419,12 @@ public class UidAtomTests extends DeviceAtomTestCase { return; } + String kernelVersion = getDevice().executeShellCommand("uname -r"); + if (kernelVersion.contains("3.18")) { + LogUtil.CLog.d("Skipping calculated power blame uid test."); + return; + } + StatsdConfig.Builder config = createConfigBuilder(); addGaugeAtomWithDimensions(config, Atom.DEVICE_CALCULATED_POWER_BLAME_UID_FIELD_NUMBER, null); -- cgit v1.2.3 From 2271b97d978a329646d2f4b090217fa77dd96a98 Mon Sep 17 00:00:00 2001 From: Raj M Date: Fri, 8 Jan 2021 20:22:07 +0000 Subject: Fix for testInputUnbindsOnImeStoppedFull For low end models, timeout needs to be larger. We are able to pass with 20 on one of our low end models. Change-Id: Id3b383e97408ad9c63c3193b6c7179c91e0f395c Test: run cts -m CtsInputMethodServiceHostTestCases -t android.inputmethodservice.cts.hostside.InputMethodServiceLifecycleTest#testInputUnbindsOnImeStoppedFull --- .../inputmethodservice/cts/devicetest/InputMethodServiceDeviceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/InputMethodServiceDeviceTest.java b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/InputMethodServiceDeviceTest.java index d226687a32a..2d95ca21ea4 100644 --- a/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/InputMethodServiceDeviceTest.java +++ b/hostsidetests/inputmethodservice/deviceside/devicetest/src/android/inputmethodservice/cts/devicetest/InputMethodServiceDeviceTest.java @@ -71,7 +71,7 @@ import java.util.stream.Collector; @RunWith(AndroidJUnit4.class) public class InputMethodServiceDeviceTest { - private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(7); + private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(20); /** Test to check CtsInputMethod1 receives onCreate and onStartInput. */ @Test -- cgit v1.2.3 From 13ab098876568d0a99adc5dbb5845e4f4709179a Mon Sep 17 00:00:00 2001 From: Hyundo Moon Date: Mon, 11 Jan 2021 21:46:57 +0900 Subject: Turn screen on when testing with MediaRouter2TestActivity This CL fixes test failures when screen is off. Bug: 175701839, Bug: 176400886 Test: While screen is off, run: atest android.media.cts.MediaRouter2Test \ android.media.cts.MediaRoute2ProviderServiceTest Change-Id: I1b17b985dc9b449ac75a90c0f0cc05497c28fdfa Merged-In: I1b17b985dc9b449ac75a90c0f0cc05497c28fdfa --- tests/tests/media/src/android/media/cts/MediaRouter2TestActivity.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/tests/media/src/android/media/cts/MediaRouter2TestActivity.java b/tests/tests/media/src/android/media/cts/MediaRouter2TestActivity.java index 370a81042da..e0ba39972b6 100644 --- a/tests/tests/media/src/android/media/cts/MediaRouter2TestActivity.java +++ b/tests/tests/media/src/android/media/cts/MediaRouter2TestActivity.java @@ -46,6 +46,8 @@ public class MediaRouter2TestActivity extends Activity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setTurnScreenOn(true); + setShowWhenLocked(true); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); } } -- cgit v1.2.3