| commit | 659d476db3473a372b9a023bd047586375b327b5 | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Mon Jun 05 17:13:02 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 05 17:13:02 2023 +0000 |
| tree | 1a45ee21a65bf901b3f4e13022f361837684b6ba | |
| parent | 0a3c0cacb5f4e831304c8d0b471e92a83db08f22 [diff] | |
| parent | e6b1c2a70f51774fa560b54c3743271babd8e603 [diff] |
Merge "Reintroduced the test with default live wallpaper" into udc-qpr-dev am: aaaf84c811 am: e6b1c2a70f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23563536 Change-Id: Ic5deb8f096d57d4b4691730b1fa7479f89a90849 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/tests/mockingservicestests/src/com/android/server/wallpaper/WallpaperManagerServiceTests.java b/services/tests/mockingservicestests/src/com/android/server/wallpaper/WallpaperManagerServiceTests.java index 51e521d..c6a5260 100644 --- a/services/tests/mockingservicestests/src/com/android/server/wallpaper/WallpaperManagerServiceTests.java +++ b/services/tests/mockingservicestests/src/com/android/server/wallpaper/WallpaperManagerServiceTests.java
@@ -90,7 +90,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -278,10 +277,8 @@ /** * Tests setWallpaperComponent and clearWallpaper should work as expected. - * TODO ignored since the assumption never passes. to be investigated. */ @Test - @Ignore("b/264533465") public void testSetThenClearComponent() { // Skip if there is no pre-defined default wallpaper component. assumeThat(sDefaultWallpaperComponent,