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

Commit 36a582e2 authored by Ted Bauer's avatar Ted Bauer Committed by Android (Google) Code Review
Browse files

Merge "Register FlagManager as a System Service" into main

parents d5d33d5b 1b4f2a0d

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ java_defaults { 
        "bouncycastle-repackaged-unbundled",

        "com.android.sysprop.foldlockbehavior",

        "com.android.sysprop.view",

        "configinfra_framework_flags_java_lib",

        "framework-internal-utils",

        "dynamic_instrumentation_manager_aidl-java",

        // If MimeMap ever becomes its own APEX, then this dependency would need to be removed

core/java/android/app/SystemServiceRegistry.java

+6 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.app;



import static android.app.appfunctions.flags.Flags.enableAppFunctionManager;

import static android.provider.flags.Flags.stageFlagsForBuild;

import static android.server.Flags.removeGameManagerServiceFromWear;



import android.accounts.AccountManager;
@@ -216,6 +217,7 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.os.Vibrator;

import android.os.VibratorManager;

import android.os.flagging.ConfigInfrastructureFrameworkInitializer;

import android.os.health.SystemHealthManager;

import android.os.image.DynamicSystemManager;

import android.os.image.IDynamicSystemService;
@@ -1837,6 +1839,10 @@ public final class SystemServiceRegistry { 
            VirtualizationFrameworkInitializer.registerServiceWrappers();

            ConnectivityFrameworkInitializerBaklava.registerServiceWrappers();



            if (stageFlagsForBuild()) {

                ConfigInfrastructureFrameworkInitializer.registerServiceWrappers();

            }



            if (com.android.server.telecom.flags.Flags.telecomMainlineBlockedNumbersManager()) {

                ProviderFrameworkInitializer.registerServiceWrappers();

            }