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

Commit 344cb5c5 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Enable IpcDataCache on Ravenwood 

With PropertyInvalidatedCache

Flag: EXEMPT host test change only
Bug: 375633409
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
Merged-in: I37512b1cd6b6478100b44e655ee12fa444fd8e46
Change-Id: I37512b1cd6b6478100b44e655ee12fa444fd8e46
parent 6dbe4c01

core/java/android/app/PropertyInvalidatedCache.java

+1 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ import java.util.concurrent.atomic.AtomicLong; 
 * @hide

 */

@TestApi

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public class PropertyInvalidatedCache<Query, Result> {

    /**

     * This is a configuration class that customizes a cache instance.

core/java/android/os/IpcDataCache.java

+1 −0
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ import java.util.concurrent.atomic.AtomicLong; 
 */

@TestApi

@SystemApi(client=SystemApi.Client.MODULE_LIBRARIES)

@android.ravenwood.annotation.RavenwoodKeepWholeClass

public class IpcDataCache<Query, Result> extends PropertyInvalidatedCache<Query, Result> {

    /**

     * {@inheritDoc}

core/tests/coretests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ android_ravenwood_test { 
        "src/android/content/ContextTest.java",

        "src/android/content/pm/PackageManagerTest.java",

        "src/android/content/pm/UserInfoTest.java",

        "src/android/app/PropertyInvalidatedCacheTests.java",

        "src/android/database/CursorWindowTest.java",

        "src/android/os/**/*.java",

        "src/android/telephony/PinResultTest.java",

core/tests/coretests/src/android/app/PropertyInvalidatedCacheTests.java

+0 −4
Original line number Diff line number Diff line
@@ -39,11 +39,7 @@ import org.junit.Test; 
 *  atest FrameworksCoreTests:PropertyInvalidatedCacheTests

 */

@SmallTest

@IgnoreUnderRavenwood(blockedBy = PropertyInvalidatedCache.class)

public class PropertyInvalidatedCacheTests {

    @Rule

    public final RavenwoodRule mRavenwood = new RavenwoodRule();



    // Configuration for creating caches

    private static final String MODULE = PropertyInvalidatedCache.MODULE_TEST;

    private static final String API = "testApi";

core/tests/coretests/src/android/os/IpcDataCacheTest.java

+0 −3
Original line number Diff line number Diff line
@@ -37,10 +37,7 @@ import org.junit.Test; 
 *  atest FrameworksCoreTests:IpcDataCacheTest

 */

@SmallTest

@IgnoreUnderRavenwood(blockedBy = IpcDataCache.class)

public class IpcDataCacheTest {

    @Rule

    public final RavenwoodRule mRavenwood = new RavenwoodRule();



    // Configuration for creating caches

    private static final String MODULE = IpcDataCache.MODULE_TEST;