Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6b1c2a7 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Reintroduced the test with default live wallpaper" into udc-qpr-dev am: aaaf84c8 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23563536



Change-Id: I880f41561bb7b0a75dcb460ed6d4108b0746f8ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 233a78c3 aaaf84c8

services/tests/mockingservicestests/src/com/android/server/wallpaper/WallpaperManagerServiceTests.java

+0 −3
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ import org.junit.AfterClass; 
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 @@ public class WallpaperManagerServiceTests { 


    /**

     * 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,