Merge "Cleanup flag: inputManagerLifecycleSupport" into main (8b1ff2e3) · Commits · e / os / android_frameworks_base

core/java/android/hardware/input/input_framework.aconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -27,17 +27,6 @@ flag {
		bug: "286551975"
		}

		flag {
		name: "input_manager_lifecycle_support"
		namespace: "input"
		description: "Add support for Lifecycle support in input manager"
		bug: "362473586"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		namespace: "input_native"
		name: "manage_key_gestures"

services/core/java/com/android/server/input/InputManagerInternal.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -146,13 +146,6 @@ public abstract class InputManagerInternal {
		*/
		public abstract void notifyInputMethodConnectionActive(boolean connectionIsActive);

		/**
		* Notify user id changes to input.
		*
		* TODO(b/362473586): Cleanup after input shifts to Lifecycle with user change callbacks
		*/
		public abstract void setCurrentUser(@UserIdInt int newUserId);

		/** Callback interface for notifications relating to the lid switch. */
		public interface LidSwitchCallback {
		/**

services/core/java/com/android/server/input/InputManagerService.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -3842,11 +3842,6 @@ public class InputManagerService extends IInputManager.Stub
		InputManagerService.this.setAccessibilityPointerIconScaleFactor(displayId, scaleFactor);
		}

		@Override
		public void setCurrentUser(@UserIdInt int newUserId) {
		mHandler.obtainMessage(MSG_CURRENT_USER_CHANGED, newUserId).sendToTarget();
		}

		@Override
		public void registerShortcutKey(long shortcutCode, IShortcutService shortcutKeyReceiver)
		throws RemoteException {

services/core/java/com/android/server/policy/PhoneWindowManager.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -86,7 +86,6 @@ import static android.view.contentprotection.flags.Flags.createAccessibilityOver
		import static com.android.hardware.input.Flags.enableNew25q2Keycodes;
		import static com.android.hardware.input.Flags.enableTalkbackAndMagnifierKeyGestures;
		import static com.android.hardware.input.Flags.enableVoiceAccessKeyGestures;
		import static com.android.hardware.input.Flags.inputManagerLifecycleSupport;
		import static com.android.internal.config.sysui.SystemUiDeviceConfigFlags.SCREENSHOT_KEYCHORD_DELAY;
		import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.CAMERA_LENS_COVERED;
		import static com.android.server.policy.WindowManagerPolicy.WindowManagerFuncs.CAMERA_LENS_COVER_ABSENT;
		@@ -6515,9 +6514,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		statusBar.setCurrentUser(newUserId);
		}
		mModifierShortcutManager.setCurrentUser(UserHandle.of(newUserId));
		if (!inputManagerLifecycleSupport()) {
		mInputManagerInternal.setCurrentUser(newUserId);
		}
		}

		@Override

services/java/com/android/server/SystemServer.java

+2 −23

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import static android.system.OsConstants.O_CLOEXEC;
		import static android.system.OsConstants.O_RDONLY;
		import static android.view.Display.DEFAULT_DISPLAY;

		import static com.android.hardware.input.Flags.inputManagerLifecycleSupport;
		import static com.android.server.utils.TimingsTraceAndSlog.SYSTEM_SERVER_TIMING_TAG;
		import static com.android.tradeinmode.flags.Flags.enableTradeInMode;

		@@ -1686,12 +1685,8 @@ public final class SystemServer implements Dumpable {
		t.traceEnd();

		t.traceBegin("StartInputManagerService");
		if (inputManagerLifecycleSupport()) {
		inputManager = mSystemServiceManager.startService(
		InputManagerService.Lifecycle.class).getService();
		} else {
		inputManager = new InputManagerService(context);
		}
		t.traceEnd();

		t.traceBegin("DeviceStateManagerService");
		@@ -1712,10 +1707,6 @@ public final class SystemServer implements Dumpable {
		ServiceManager.addService(Context.WINDOW_SERVICE, wm, /* allowIsolated= */ false,
		DUMP_FLAG_PRIORITY_CRITICAL \| DUMP_FLAG_PRIORITY_HIGH
		\| DUMP_FLAG_PROTO);
		if (!inputManagerLifecycleSupport()) {
		ServiceManager.addService(Context.INPUT_SERVICE, inputManager,
		/* allowIsolated= */ false, DUMP_FLAG_PRIORITY_CRITICAL);
		}
		t.traceEnd();

		t.traceBegin("SetWindowManagerService");
		@@ -3426,18 +3417,6 @@ public final class SystemServer implements Dumpable {
		reportWtf("Notifying NetworkTimeService running", e);
		}
		t.traceEnd();
		if (!inputManagerLifecycleSupport()) {
		t.traceBegin("MakeInputManagerServiceReady");
		try {
		// TODO(BT) Pass parameter to input manager
		if (inputManagerF != null) {
		inputManagerF.systemRunning();
		}
		} catch (Throwable e) {
		reportWtf("Notifying InputManagerService running", e);
		}
		t.traceEnd();
		}
		t.traceBegin("MakeTelephonyRegistryReady");
		try {
		if (telephonyRegistryF != null) {