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

Commit ac14351e authored by Jeff Brown's avatar Jeff Brown
Browse files

Move some APIs from window manager to input manager. 

Simplified input injection API down to just one call.

Removed all input state reading API.  It was only used by the
window manager policy and required a permission that applications
could not obtain.  READ_INPUT_STATE is now unused and deprecated.

Change-Id: I41278141586ddee9468cae0fb59ff0dced6cbc00
parent 030711c3

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ package android { 
    field public static final java.lang.String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE";

    field public static final java.lang.String READ_FRAME_BUFFER = "android.permission.READ_FRAME_BUFFER";

    field public static final java.lang.String READ_HISTORY_BOOKMARKS = "com.android.browser.permission.READ_HISTORY_BOOKMARKS";

    field public static final java.lang.String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE";

    field public static final deprecated java.lang.String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE";

    field public static final java.lang.String READ_LOGS = "android.permission.READ_LOGS";

    field public static final java.lang.String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE";

    field public static final java.lang.String READ_PROFILE = "android.permission.READ_PROFILE";

cmds/input/src/com/android/commands/input/Input.java

+12 −27
Original line number Diff line number Diff line
@@ -16,11 +16,12 @@ 


package com.android.commands.input;



import android.hardware.input.InputManager;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.util.Log;

import android.view.IWindowManager;

import android.view.InputDevice;

import android.view.KeyCharacterMap;

import android.view.KeyEvent;

import android.view.MotionEvent;
@@ -33,8 +34,6 @@ import android.view.MotionEvent; 
public class Input {

    private static final String TAG = "Input";



    private IWindowManager mWindowManager;



    /**

     * Command-line entry point.

     *
@@ -44,13 +43,6 @@ public class Input { 
        (new Input()).run(args);

    }



    private IWindowManager getWindowManager() {

        if (mWindowManager == null) {

            mWindowManager = (IWindowManager.Stub.asInterface(ServiceManager.getService("window")));

        }

        return mWindowManager;

    }



    private void run(String[] args) {

        if (args.length < 1) {

            showUsage();
@@ -127,8 +119,10 @@ public class Input { 


    private void sendKeyEvent(int keyCode) {

        long now = SystemClock.uptimeMillis();

        injectKeyEvent(new KeyEvent(now, now, KeyEvent.ACTION_DOWN, keyCode, 0));

        injectKeyEvent(new KeyEvent(now, now, KeyEvent.ACTION_UP, keyCode, 0));

        injectKeyEvent(new KeyEvent(now, now, KeyEvent.ACTION_DOWN, keyCode, 0, 0,

                KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0, InputDevice.SOURCE_KEYBOARD));

        injectKeyEvent(new KeyEvent(now, now, KeyEvent.ACTION_UP, keyCode, 0, 0,

                KeyCharacterMap.VIRTUAL_KEYBOARD, 0, 0, InputDevice.SOURCE_KEYBOARD));

    }



    private void sendTap(float x, float y) {
@@ -150,23 +144,14 @@ public class Input { 
    }



    private void injectKeyEvent(KeyEvent event) {

        try {

        Log.i(TAG, "InjectKeyEvent: " + event);

            getWindowManager().injectKeyEvent(event, true);

        } catch (RemoteException ex) {

            Log.i(TAG, "RemoteException", ex);

        }

        InputManager.injectInputEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);

    }



    private void injectPointerEvent(MotionEvent event) {

        try {

        event.setSource(InputDevice.SOURCE_TOUCHSCREEN);

        Log.i("Input", "InjectPointerEvent: " + event);

            getWindowManager().injectPointerEvent(event, true);

        } catch (RemoteException ex) {

            Log.i(TAG, "RemoteException", ex);

        } finally {

            event.recycle();

        }

        InputManager.injectInputEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);

    }



    private static final float lerp(float a, float b, float alpha) {
@@ -174,7 +159,7 @@ public class Input { 
    }



    private void showUsage() {

        System.err.println("usage: input [text|keyevent]");

        System.err.println("usage: input ...");

        System.err.println("       input text <string>");

        System.err.println("       input keyevent <key code>");

        System.err.println("       input tap <x> <y>");

core/java/android/app/ContextImpl.java

+4 −3
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.graphics.drawable.Drawable; 
import android.hardware.ISerialManager;

import android.hardware.SensorManager;

import android.hardware.SerialManager;

import android.hardware.input.IInputManager;

import android.hardware.input.InputManager;

import android.hardware.usb.IUsbManager;

import android.hardware.usb.UsbManager;

core/java/android/app/Instrumentation.java

+31 −12
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.pm.ActivityInfo;

import android.content.res.Configuration;

import android.hardware.input.InputManager;

import android.os.Bundle;

import android.os.Debug;

import android.os.IBinder;
@@ -35,6 +36,7 @@ import android.os.SystemClock; 
import android.util.AndroidRuntimeException;

import android.util.Log;

import android.view.IWindowManager;

import android.view.InputDevice;

import android.view.KeyCharacterMap;

import android.view.KeyEvent;

import android.view.MotionEvent;
@@ -859,11 +861,30 @@ public class Instrumentation { 
     */

    public void sendKeySync(KeyEvent event) {

        validateNotAppThread();

        try {

            (IWindowManager.Stub.asInterface(ServiceManager.getService("window")))

                .injectKeyEvent(event, true);

        } catch (RemoteException e) {



        long downTime = event.getDownTime();

        long eventTime = event.getEventTime();

        int action = event.getAction();

        int code = event.getKeyCode();

        int repeatCount = event.getRepeatCount();

        int metaState = event.getMetaState();

        int deviceId = event.getDeviceId();

        int scancode = event.getScanCode();

        int source = event.getSource();

        int flags = event.getFlags();

        if (source == InputDevice.SOURCE_UNKNOWN) {

            source = InputDevice.SOURCE_KEYBOARD;

        }

        if (eventTime == 0) {

            eventTime = SystemClock.uptimeMillis();

        }

        if (downTime == 0) {

            downTime = eventTime;

        }

        KeyEvent newEvent = new KeyEvent(downTime, eventTime, action, code, repeatCount, metaState,

                deviceId, scancode, flags | KeyEvent.FLAG_FROM_SYSTEM, source);

        InputManager.injectInputEvent(newEvent,

                InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);

    }

    

    /**
@@ -902,11 +923,10 @@ public class Instrumentation { 
     */

    public void sendPointerSync(MotionEvent event) {

        validateNotAppThread();

        try {

            (IWindowManager.Stub.asInterface(ServiceManager.getService("window")))

                .injectPointerEvent(event, true);

        } catch (RemoteException e) {

        if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) == 0) {

            event.setSource(InputDevice.SOURCE_TOUCHSCREEN);

        }

        InputManager.injectInputEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);

    }



    /**
@@ -922,11 +942,10 @@ public class Instrumentation { 
     */

    public void sendTrackballEventSync(MotionEvent event) {

        validateNotAppThread();

        try {

            (IWindowManager.Stub.asInterface(ServiceManager.getService("window")))

                .injectTrackballEvent(event, true);

        } catch (RemoteException e) {

        if ((event.getSource() & InputDevice.SOURCE_CLASS_TRACKBALL) == 0) {

            event.setSource(InputDevice.SOURCE_TRACKBALL);

        }

        InputManager.injectInputEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);

    }



    /**

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

+16 −0
Original line number Diff line number Diff line
@@ -16,6 +16,22 @@ 


package android.hardware.input;



import android.view.InputDevice;

import android.view.InputEvent;



/** @hide */

interface IInputManager {

    // Gets input device information.

    InputDevice getInputDevice(int deviceId);

    int[] getInputDeviceIds();



    // Reports whether the hardware supports the given keys; returns true if successful

    boolean hasKeys(int deviceId, int sourceMask, in int[] keyCodes, out boolean[] keyExists);



    // Temporarily changes the pointer speed.

    void tryPointerSpeed(int speed);



    // Injects an input event into the system.  To inject into windows owned by other

    // applications, the caller must have the INJECT_EVENTS permission.

    boolean injectInputEvent(in InputEvent ev, int mode);

}