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

Commit 7ef24fef authored by Lee Shombert's avatar Lee Shombert Committed by Android (Google) Code Review
Browse files

Merge "Allow PIC caches to cache nulls" into main

parents 11608e9f 82cdbf09

core/java/android/app/PropertyInvalidatedCache.java

+1 −1
Original line number Diff line number Diff line
@@ -1356,7 +1356,7 @@ public class PropertyInvalidatedCache<Query, Result> { 
            @Nullable QueryHandler<Query, Result> computer) {

        mPropertyName = createPropertyName(args.mModule, args.mApi);

        mCacheName = cacheName;

        mCacheNullResults = args.mCacheNulls && Flags.picCacheNulls();

        mCacheNullResults = args.mCacheNulls;

        mNonce = getNonceHandler(mPropertyName);

        mMaxEntries = args.mMaxEntries;

        mCache = new CacheMap<>(args.mIsolateUids, args.mTestMode);

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

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.app;



import static android.app.Flags.FLAG_PIC_CACHE_NULLS;

import static android.app.Flags.FLAG_PIC_ISOLATE_CACHE_BY_UID;

import static android.app.PropertyInvalidatedCache.NONCE_UNSET;

import static android.app.PropertyInvalidatedCache.MODULE_BLUETOOTH;
@@ -711,7 +710,6 @@ public class PropertyInvalidatedCacheTests { 
        }

    }



    @RequiresFlagsEnabled(FLAG_PIC_CACHE_NULLS)

    @Test

    public void testCachingNulls() {

        TestCache cache = new TestCache(new Args(MODULE_TEST)

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

+0 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.os;



import static android.app.Flags.FLAG_PIC_CACHE_NULLS;

import static android.app.Flags.FLAG_PIC_ISOLATE_CACHE_BY_UID;



import static org.junit.Assert.assertEquals;
@@ -511,7 +510,6 @@ public class IpcDataCacheTest { 
        IpcDataCache.setTestMode(true);

    }



    @RequiresFlagsEnabled(FLAG_PIC_CACHE_NULLS)

    @Test

    public void testCachingNulls() {

        IpcDataCache.Config c =