| commit | 2658b1f70aee313647aaf5cd300d7ffc4b601769 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Fri Jun 26 15:06:59 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 26 15:06:59 2020 +0000 |
| tree | be1d8b3802b819cc4c20913399db4c594dcb36ed | |
| parent | 01562cdf9fea41a36c13cc8a52b73193f28e0929 [diff] | |
| parent | 5c66289b6bf246fca3f759dacae4afcb9fea7c56 [diff] |
Merge "Increase ConnDiagsTest timeout for end-to-end test." into rvc-dev
diff --git a/hostsidetests/appcompat/host/lib/src/android/compat/cts/CompatChangeGatingTestCase.java b/hostsidetests/appcompat/host/lib/src/android/compat/cts/CompatChangeGatingTestCase.java index 07a51af1d..d637ff0 100644 --- a/hostsidetests/appcompat/host/lib/src/android/compat/cts/CompatChangeGatingTestCase.java +++ b/hostsidetests/appcompat/host/lib/src/android/compat/cts/CompatChangeGatingTestCase.java
@@ -226,7 +226,8 @@ StatsdConfigProto.StatsdConfig.Builder configBuilder = StatsdConfigProto.StatsdConfig.newBuilder() .setId(configId) - .addAllowedLogSource(pkgName); + .addAllowedLogSource(pkgName) + .addWhitelistedAtomIds(Atom.APP_COMPATIBILITY_CHANGE_REPORTED_FIELD_NUMBER); StatsdConfigProto.SimpleAtomMatcher.Builder simpleAtomMatcherBuilder = StatsdConfigProto.SimpleAtomMatcher .newBuilder().setAtomId(
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java index 72e8293..5beb487 100644 --- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java +++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
@@ -726,6 +726,7 @@ try { // Install and enable assistant, notice that profile can't have assistant. installAppAsUser(ASSIST_APP_APK, mPrimaryUserId); + waitForBroadcastIdle(); setVoiceInteractionService(ASSIST_INTERACTION_SERVICE); setScreenCaptureDisabled_assist(mUserId, true /* disabled */); } finally {