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

Commit 6be50758 authored by Makoto Onuki's avatar Makoto Onuki Committed by Gerrit Code Review
Browse files

Merge "Enable IpcDataCache on Ravenwood" into main

parents 33dc202b 344cb5c5

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;