diff options
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | core/java/android/app/SystemServiceRegistry.java | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 48f0928f24d7..c57ff568e4c6 100644 --- a/Android.bp +++ b/Android.bp @@ -398,6 +398,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 diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index ee0c38c60ff1..6609665096d7 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -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; @@ -1823,6 +1825,10 @@ public final class SystemServiceRegistry { VirtualizationFrameworkInitializer.registerServiceWrappers(); VcnFrameworkInitializer.registerServiceWrappers(); + if (stageFlagsForBuild()) { + ConfigInfrastructureFrameworkInitializer.registerServiceWrappers(); + } + if (com.android.server.telecom.flags.Flags.telecomMainlineBlockedNumbersManager()) { ProviderFrameworkInitializer.registerServiceWrappers(); } |