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

Commit 95e769ef authored by Lee Shombert's avatar Lee Shombert
Browse files

Update trunk-stable flag for IPC test apis 

Add a new flag to guard the IPC test mode APIs.  The old flag had been
deleted (through a revert) and re-added, which is not a supported process.
The old flag is now explicitly deleted.

The API file has been updated to reflect the new flag name.

NO_EXPORTED_FLAG_DELETION_CHECK="deleted flag never moved past DEV"

Flag: android.os.ipc_data_cache_testmode_apis
Bug: 396173886
Test: presbumit
Change-Id: If9c627802ab1ee2583a8b953973bab3bead61d4f
parent 197709fe

core/api/module-lib-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ package android.os { 
    method public void invalidateCache();

    method public static void invalidateCache(@NonNull String, @NonNull String);

    method @Nullable public Result query(@NonNull Query);

    method @FlaggedApi("android.os.ipc_data_cache_test_apis") public static void setCacheTestMode(boolean);

    method @FlaggedApi("android.os.ipc_data_cache_testmode_apis") public static void setCacheTestMode(boolean);

    field public static final String MODULE_BLUETOOTH = "bluetooth";

  }

core/java/android/os/IpcDataCache.java

+1 −1
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ public class IpcDataCache<Query, Result> extends PropertyInvalidatedCache<Query, 
     * @throws IllegalStateException if the process is not running an instrumentation test.

     * @hide

     */

    @FlaggedApi(android.os.Flags.FLAG_IPC_DATA_CACHE_TEST_APIS)

    @FlaggedApi(android.os.Flags.FLAG_IPC_DATA_CACHE_TESTMODE_APIS)

    @SystemApi(client=SystemApi.Client.MODULE_LIBRARIES)

    public static void setCacheTestMode(boolean mode) {

        // Trunk-stable flagging requires that this API have a name different from the existing

core/java/android/os/flags.aconfig

+3 −2
Original line number Diff line number Diff line
@@ -246,9 +246,10 @@ flag { 
}



flag {

     name: "ipc_data_cache_test_apis"

     name: "ipc_data_cache_testmode_apis"

     namespace: "system_performance"

     description: "Expose IpcDataCache test apis to mainline modules."

     description: "Expose IpcDataCache testmode apis to mainline modules."

     is_fixed_read_only: true

     bug: "396173886"

     is_exported: true

}