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

Commit 4532e615 authored by Jeff Brown's avatar Jeff Brown
Browse files

Refactor input system into its own service. 

Extracted the input system from the window manager service into
a new input manager service.  This will make it easier to
offer new input-related features to applications.

Cleaned up the input manager service JNI layer somewhat to get rid
of all of the unnecessary checks for whether the input manager
had been initialized.  Simplified the callback layer as well.

Change-Id: I3175d01307aed1420780d3c093d2694b41edf66e
parent 9df6e7a9

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/content/pm/IPackageStatsObserver.aidl \

	core/java/android/database/IContentObserver.aidl \

	core/java/android/hardware/ISerialManager.aidl \

	core/java/android/hardware/input/IInputManager.aidl \

	core/java/android/hardware/usb/IUsbManager.aidl \

	core/java/android/net/IConnectivityManager.aidl \

	core/java/android/net/INetworkManagementEventObserver.aidl \

core/java/android/hardware/input/IInputManager.aidl

0 → 100644
+21 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.input;



/** @hide */

interface IInputManager {

}

policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ import android.view.WindowManagerPolicy; 
 * This class is created by the initialization routine of the {@link WindowManagerPolicy},

 * and runs on its thread.  The keyguard UI is created from that thread in the

 * constructor of this class.  The apis may be called from other threads, including the

 * {@link com.android.server.wm.InputManager}'s and {@link android.view.WindowManager}'s.

 * {@link com.android.server.input.InputManagerService}'s and {@link android.view.WindowManager}'s.

 * Therefore, methods on this class are synchronized, and any action that is pointed

 * directly to the keyguard UI is posted to a {@link Handler} to ensure it is taken on the UI

 * thread of the keyguard.

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

+1 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ class ServerThread extends Thread { 
                    factoryTest != SystemServer.FACTORY_TEST_LOW_LEVEL,

                    !firstBoot);

            ServiceManager.addService(Context.WINDOW_SERVICE, wm);

            ServiceManager.addService(Context.INPUT_SERVICE, wm.getInputManagerService());



            ActivityManagerService.self().setWindowManager(wm);

services/java/com/android/server/accessibility/AccessibilityInputFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.server.accessibility;



import com.android.server.wm.InputFilter;

import com.android.server.input.InputFilter;



import android.content.Context;

import android.util.Slog;