Snap for 8084978 from c54f8a8f8f6fd088e3fb74411792c1d7dae24369 to r-keystone-qcom-release
Change-Id: Ia325cf102a7551c74f08bfe16aad2f02b33653bd
diff --git a/hostsidetests/statsd/src/android/cts/statsd/atom/UidAtomTests.java b/hostsidetests/statsd/src/android/cts/statsd/atom/UidAtomTests.java
index 566dc08..2b1124d 100644
--- a/hostsidetests/statsd/src/android/cts/statsd/atom/UidAtomTests.java
+++ b/hostsidetests/statsd/src/android/cts/statsd/atom/UidAtomTests.java
@@ -1129,8 +1129,9 @@
// Start test app.
try (AutoCloseable a = withActivity("StatsdCtsForegroundActivity", "action",
"action.show_notification")) {
- Thread.sleep(WAIT_TIME_LONG);
// Trigger a pull and wait for new pull before killing the process.
+ Thread.sleep(WAIT_TIME_LONG);
+ // Trigger new pull.
setAppBreadcrumbPredicate();
Thread.sleep(WAIT_TIME_LONG);
}
diff --git a/tests/tests/media/AndroidManifest.xml b/tests/tests/media/AndroidManifest.xml
index 3825d8f..c24f26b 100644
--- a/tests/tests/media/AndroidManifest.xml
+++ b/tests/tests/media/AndroidManifest.xml
@@ -123,7 +123,7 @@
</intent-filter>
</activity>
<activity android:name="android.media.cts.MockActivity" />
- <activity android:name="android.media.cts.MediaRouter2TestActivity"/>
+ <activity android:name="android.media.cts.MediaRouter2TestActivity" />
<service android:name="android.media.cts.RemoteVirtualDisplayService"
android:process=":remoteService" >
<intent-filter>