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

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

Merge "Delete pic_uses_shared_memory" into main

parents d8cd00a9 30217eb3

core/java/android/app/PropertyInvalidatedCache.java

+1 −2
Original line number Diff line number Diff line
@@ -1197,8 +1197,7 @@ public class PropertyInvalidatedCache<Query, Result> { 


    @android.ravenwood.annotation.RavenwoodReplace

    private static boolean isSharedMemoryAvailable() {

        return com.android.internal.os.Flags.applicationSharedMemoryEnabled()

                && android.app.Flags.picUsesSharedMemory();

        return true;

    }



    private static boolean isSharedMemoryAvailable$ravenwood() {

core/java/android/app/performance.aconfig

+0 −9
Original line number Diff line number Diff line 
package: "android.app"

container: "system"



flag {

     namespace: "system_performance"

     name: "pic_uses_shared_memory"

     is_exported: true

     is_fixed_read_only: true

     description: "PropertyInvalidatedCache uses shared memory for nonces."

     bug: "360897450"

}



flag {

     namespace: "system_performance"

     name: "enforce_pic_testmode_protocol"

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

+0 −3
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import static android.app.PropertyInvalidatedCache.MODULE_BLUETOOTH; 
import static android.app.PropertyInvalidatedCache.MODULE_SYSTEM;

import static android.app.PropertyInvalidatedCache.MODULE_TEST;

import static android.app.PropertyInvalidatedCache.NonceStore.INVALID_NONCE_INDEX;

import static com.android.internal.os.Flags.FLAG_APPLICATION_SHARED_MEMORY_ENABLED;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;
@@ -561,7 +560,6 @@ public class PropertyInvalidatedCacheTests { 


    // Verify the behavior of shared memory nonce storage.  This does not directly test the cache

    // storing nonces in shared memory.

    @RequiresFlagsEnabled(FLAG_APPLICATION_SHARED_MEMORY_ENABLED)

    @Test

    @DisabledOnRavenwood(reason = "PIC doesn't use SharedMemory on Ravenwood")

    public void testSharedMemoryStorage() {
@@ -611,7 +609,6 @@ public class PropertyInvalidatedCacheTests { 
    // Verify that the configured number of nonce slots is actually available.  This test

    // hard-codes the configured number of slots, which means that this test must be changed

    // whenever the shared memory configuration changes.

    @RequiresFlagsEnabled(FLAG_APPLICATION_SHARED_MEMORY_ENABLED)

    @Test

    @DisabledOnRavenwood(reason = "PIC doesn't use SharedMemory on Ravenwood")

    public void testSharedMemoryNonceConfig() {