Merge "Small clanup in InputManagerService" into main

    private static final int MSG_SYSTEM_READY = 5;

    private static final int MSG_SYSTEM_READY = 5;

    private static final int DEFAULT_VIBRATION_MAGNITUDE = 192;

    private static final int DEFAULT_VIBRATION_MAGNITUDE = 192;

    private static final AdditionalDisplayInputProperties

            DEFAULT_ADDITIONAL_DISPLAY_INPUT_PROPERTIES = new AdditionalDisplayInputProperties();

    private final NativeInputManagerService mNative;

    private final NativeInputManagerService mNative;

    private final Context mContext;

    private final Context mContext;

    private final InputManagerHandler mHandler;

    private final InputManagerHandler mHandler;

    @UserIdInt

    private int mCurrentUserId = UserHandle.USER_SYSTEM;

    private DisplayManagerInternal mDisplayManagerInternal;

    private DisplayManagerInternal mDisplayManagerInternal;

    private WindowManagerInternal mWindowManagerInternal;

    private WindowManagerInternal mWindowManagerInternal;

    final Object mKeyEventActivityLock = new Object();

    final Object mKeyEventActivityLock = new Object();

    @GuardedBy("mKeyEventActivityLock")

    @GuardedBy("mKeyEventActivityLock")

    private List<IKeyEventActivityListener> mKeyEventActivityListenersToNotify =

    private final List<IKeyEventActivityListener> mKeyEventActivityListenersToNotify =

            new ArrayList<>();

            new ArrayList<>();

    // Rate limit for key event activity detection. Prevent the listener from being notified

    // Rate limit for key event activity detection. Prevent the listener from being notified

    }

    }

    private void handleCurrentUserChanged(@UserIdInt int userId) {

    private void handleCurrentUserChanged(@UserIdInt int userId) {

        mCurrentUserId = userId;

        mKeyGestureController.setCurrentUserId(userId);

        mKeyGestureController.setCurrentUserId(userId);

    }

    }