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

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

Merge "Cache ContentCaptureManager service behind a flag" into main

parents 3611e34c f521ab7e

services/core/java/com/android/server/am/ActivityManagerService.java

+7 −0
Original line number Diff line number Diff line
@@ -2825,6 +2825,13 @@ public class ActivityManagerService extends IActivityManager.Stub 
            addServiceToMap(mAppBindArgs, Context.USER_SERVICE);

            addServiceToMap(mAppBindArgs, "mount");

            addServiceToMap(mAppBindArgs, Context.PLATFORM_COMPAT_SERVICE);













            // During startup, bound applications will always attempt registration of a













            // ContentCaptureOptions listener with the ContentCaptureManager service. Seeding













            // applications with the service handle avoids an unnecessary ServiceManager hop.













            if (Flags.cacheContentCaptureService()) {













                addServiceToMap(mAppBindArgs, Context.CONTENT_CAPTURE_MANAGER_SERVICE);













            }















        }















        return mAppBindArgs;















    }

































services/core/java/com/android/server/am/flags.aconfig



+10
−0




























Original line number
Diff line number
Diff line








@@ -238,3 +238,13 @@ flag {













        purpose: PURPOSE_BUGFIX















    }















}



























flag {













    name: "cache_content_capture_service"













    namespace: "system_performance"













    description: "Seed ContentCaptureManager into the bound application's initial service cache"













    bug: "414380203"













    metadata {













        purpose: PURPOSE_BUGFIX













    }













}