diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-01-14 05:07:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-14 05:07:21 +0000 |
| commit | d2e94c9cab9a1ebacaf17df4ee9de83f72030a87 (patch) | |
| tree | a0be76341693b0864009368b6e4202ade71b110b | |
| parent | ebe2a39efad3d61e6d14f075d42873073daf7799 (diff) | |
| parent | 59a7b6771cb7ccce71b1e61c055c969ac5b9f8b7 (diff) | |
| download | cts-sparse-7081403-L90700000803255371.tar.gz | |
Merge "Snap for 7081194 from c1045c482891d7bd26ebc0673895f70013178c65 to android11-tests-release" into android11-tests-releasesparse-7081403-L90700000803255371
3 files changed, 9 insertions, 1 deletions
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 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); 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); } } |