diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 4a60fb7e82925..12c55f8733734 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -4410,6 +4410,10 @@
or empty if the default should be used. -->
+
+
+
com.android.systemui/com.android.systemui.media.MediaProjectionPermissionActivity
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index e9f80235d7468..daed3bb6dc42a 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -483,6 +483,7 @@
+
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 88c0ec6d9c954..fe2d0be0fe36c 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1665,7 +1665,18 @@ public final class SystemServer implements Dumpable {
// Bring up services needed for UI.
if (mFactoryTestMode != FactoryTest.FACTORY_TEST_LOW_LEVEL) {
t.traceBegin("StartInputMethodManagerLifecycle");
- mSystemServiceManager.startService(InputMethodManagerService.Lifecycle.class);
+ String immsClassName = context.getResources().getString(
+ R.string.config_deviceSpecificInputMethodManagerService);
+ if (immsClassName.isEmpty()) {
+ mSystemServiceManager.startService(InputMethodManagerService.Lifecycle.class);
+ } else {
+ try {
+ Slog.i(TAG, "Starting custom IMMS: " + immsClassName);
+ mSystemServiceManager.startService(immsClassName);
+ } catch (Throwable e) {
+ reportWtf("starting " + immsClassName, e);
+ }
+ }
t.traceEnd();
t.traceBegin("StartAccessibilityManagerService");