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

Commit 7f8e7295 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Flag removal: CachingDevelopmentImprovements" into main

parents a3f8d5ce 5ee51a31

core/java/android/content/pm/multiuser.aconfig

+0 −8
Original line number Diff line number Diff line
@@ -516,14 +516,6 @@ flag { 
  }

}



flag {

    name: "caching_development_improvements"

    namespace: "multiuser"

    description: "System API to simplify caching implamentations"

    bug: "364947162"

    is_fixed_read_only: true

}



flag {

  name: "show_custom_unlock_title_inside_private_profile"

  namespace: "profile_experiences"

core/java/android/os/IpcDataCache.java

+2 −3
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ public class IpcDataCache<Query, Result> extends PropertyInvalidatedCache<Query, 
     * @hide

     */

    public IpcDataCache(@NonNull Config config, @NonNull RemoteCall<Query, Result> remoteCall) {

      this(config, android.multiuser.Flags.cachingDevelopmentImprovements() ?

      this(config,

        new QueryHandler<Query, Result>() {

            @Override

            public Result apply(Query query) {
@@ -626,7 +626,7 @@ public class IpcDataCache<Query, Result> extends PropertyInvalidatedCache<Query, 
                    throw e.rethrowFromSystemServer();

                }

            }

        } : new SystemServerCallHandler<>(remoteCall));

        });

    }
@@ -638,7 +638,6 @@ public class IpcDataCache<Query, Result> extends PropertyInvalidatedCache<Query, 
     *     bypassed.

     * @hide

     */

    @FlaggedApi(android.multiuser.Flags.FLAG_CACHING_DEVELOPMENT_IMPROVEMENTS)

    public IpcDataCache(@NonNull Config config,

            @NonNull RemoteCall<Query, Result> remoteCall,

            @NonNull BypassCall<Query> bypass) {

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

+0 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static org.junit.Assert.fail; 


import android.app.PropertyInvalidatedCache;

import android.app.PropertyInvalidatedCache.Args;

import android.multiuser.Flags;

import android.platform.test.annotations.DisabledOnRavenwood;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;
@@ -205,7 +204,6 @@ public class IpcDataCacheTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_CACHING_DEVELOPMENT_IMPROVEMENTS)

    public void testRemoteCallBypass() {



        // A stand-in for the binder.  The test verifies that calls are passed through to