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

Commit ae89692d authored by Sandro Meier's avatar Sandro Meier
Browse files

Move InputManagerInternal to com.android.server.input 

InputManagerInternal is a left over in android.hardware.input that is
only used fromt the system_server process. This is from a change in
Honeycomb that partially got reverted. Moving this back to be able to
use com.android.server classes in InputManagerInternal for an upcoming
change.

Test: atest InputManagerServiceTests
Bug: 244516415
Change-Id: I8640f806800ef3b1ac06766b5c49b12cbb30d647
parent ed97a3e2

services/companion/java/com/android/server/companion/virtual/InputController.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.graphics.PointF; 
import android.hardware.display.DisplayManagerInternal;

import android.hardware.input.InputDeviceIdentifier;

import android.hardware.input.InputManager;

import android.hardware.input.InputManagerInternal;

import android.hardware.input.VirtualKeyEvent;

import android.hardware.input.VirtualMouseButtonEvent;

import android.hardware.input.VirtualMouseRelativeEvent;
@@ -42,6 +41,7 @@ import android.view.WindowManager; 
import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.server.LocalServices;

import com.android.server.input.InputManagerInternal;



import java.io.PrintWriter;

import java.lang.annotation.Retention;

services/core/java/com/android/server/display/DisplayManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ import android.hardware.display.IVirtualDisplayCallback; 
import android.hardware.display.VirtualDisplayConfig;

import android.hardware.display.WifiDisplayStatus;

import android.hardware.graphics.common.DisplayDecorationSupport;

import android.hardware.input.InputManagerInternal;

import android.media.projection.IMediaProjection;

import android.media.projection.IMediaProjectionManager;

import android.net.Uri;
@@ -134,6 +133,7 @@ import com.android.server.UiThread; 
import com.android.server.companion.virtual.VirtualDeviceManagerInternal;

import com.android.server.display.DisplayDeviceConfig.SensorData;

import com.android.server.display.utils.SensorUtils;

import com.android.server.input.InputManagerInternal;

import com.android.server.wm.SurfaceAnimationThread;

import com.android.server.wm.WindowManagerInternal;

services/core/java/com/android/server/dreams/DreamManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import android.content.pm.PackageManager.NameNotFoundException; 
import android.content.pm.ServiceInfo;

import android.database.ContentObserver;

import android.hardware.display.AmbientDisplayConfiguration;

import android.hardware.input.InputManagerInternal;

import android.os.Binder;

import android.os.Build;

import android.os.Handler;
@@ -66,6 +65,7 @@ import com.android.internal.util.DumpUtils; 
import com.android.server.FgThread;

import com.android.server.LocalServices;

import com.android.server.SystemService;

import com.android.server.input.InputManagerInternal;

import com.android.server.wm.ActivityInterceptorCallback;

import com.android.server.wm.ActivityTaskManagerInternal;

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

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.hardware.input;

package com.android.server.input;



import android.annotation.NonNull;

import android.graphics.PointF;

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

+1 −2
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ import android.hardware.input.IInputSensorEventListener; 
import android.hardware.input.ITabletModeChangedListener;

import android.hardware.input.InputDeviceIdentifier;

import android.hardware.input.InputManager;

import android.hardware.input.InputManagerInternal;

import android.hardware.input.InputManagerInternal.LidSwitchCallback;

import android.hardware.input.InputSensorInfo;

import android.hardware.input.KeyboardLayout;

import android.hardware.input.TouchCalibration;
@@ -123,6 +121,7 @@ import com.android.internal.util.XmlUtils; 
import com.android.server.DisplayThread;

import com.android.server.LocalServices;

import com.android.server.Watchdog;

import com.android.server.input.InputManagerInternal.LidSwitchCallback;

import com.android.server.policy.WindowManagerPolicy;



import libcore.io.IoUtils;