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

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

Add support for injecting events into ActivityContainers. 

Modified ActivityView to inject touch events it receives back into
its activity container.  The container then injects the event into
the input system along with the display id of the underlying virtual
display.

Change-Id: I23d018a2f7dd30f1f833f522eb7f143b43d8e637
parent ed8bb015

core/java/android/app/ActivityView.java

+26 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ import android.os.RemoteException; 
import android.util.AttributeSet;

import android.util.DisplayMetrics;

import android.util.Log;

import android.view.InputDevice;

import android.view.InputEvent;

import android.view.MotionEvent;

import android.view.Surface;

import android.view.TextureView;

import android.view.TextureView.SurfaceTextureListener;
@@ -112,6 +115,29 @@ public class ActivityView extends ViewGroup { 
        }

    }



    private boolean injectInputEvent(InputEvent event) {

        try {

            return mActivityContainer != null && mActivityContainer.injectEvent(event);

        } catch (RemoteException e) {

            return false;

        }

    }



    @Override

    public boolean onTouchEvent(MotionEvent event) {

        return injectInputEvent(event) || super.onTouchEvent(event);

    }



    @Override

    public boolean onGenericMotionEvent(MotionEvent event) {

        if (event.isFromSource(InputDevice.SOURCE_CLASS_POINTER)) {

            if (injectInputEvent(event)) {

                return true;

            }

        }

        return super.onGenericMotionEvent(event);

    }



    public boolean isAttachedToDisplay() {

        return mSurface != null;

    }

core/java/android/app/IActivityContainer.aidl

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.IActivityContainerCallback; 
import android.content.Intent;

import android.content.IIntentSender;

import android.os.IBinder;

import android.view.InputEvent;

import android.view.Surface;



/** @hide */
@@ -30,4 +31,5 @@ interface IActivityContainer { 
    int startActivity(in Intent intent);

    int startActivityIntentSender(in IIntentSender intentSender);

    int getDisplayId();

    boolean injectEvent(in InputEvent event);

}

core/java/android/hardware/input/InputManagerInternal.java

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.hardware.input;



import android.hardware.display.DisplayViewport;

import android.view.InputEvent;



/**

 * Input manager local system service interface.
@@ -30,4 +31,6 @@ public abstract class InputManagerInternal { 
     */

    public abstract void setDisplayViewports(DisplayViewport defaultViewport,

            DisplayViewport externalTouchViewport);



    public abstract boolean injectInputEvent(InputEvent event, int displayId, int mode);

}

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+26 −3
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ import android.hardware.display.DisplayManager; 
import android.hardware.display.DisplayManager.DisplayListener;

import android.hardware.display.DisplayManagerGlobal;

import android.hardware.display.VirtualDisplay;

import android.hardware.input.InputManager;

import android.hardware.input.InputManagerInternal;

import android.os.Binder;

import android.os.Bundle;

import android.os.Debug;
@@ -81,9 +83,11 @@ import android.util.SparseArray; 
import android.util.SparseIntArray;

import android.view.Display;

import android.view.DisplayInfo;

import android.view.InputEvent;

import android.view.Surface;

import com.android.internal.app.HeavyWeightSwitcherActivity;

import com.android.internal.os.TransferPipe;

import com.android.server.LocalServices;

import com.android.server.am.ActivityManagerService.PendingActivityLaunch;

import com.android.server.am.ActivityStack.ActivityState;

import com.android.server.wm.WindowManagerService;
@@ -225,6 +229,8 @@ public final class ActivityStackSupervisor implements DisplayListener { 
    /** Mapping from displayId to display current state */

    private SparseArray<ActivityDisplay> mActivityDisplays = new SparseArray<ActivityDisplay>();



    InputManagerInternal mInputManagerInternal;



    public ActivityStackSupervisor(ActivityManagerService service) {

        mService = service;

        PowerManager pm = (PowerManager)mService.mContext.getSystemService(Context.POWER_SERVICE);
@@ -255,6 +261,8 @@ public final class ActivityStackSupervisor implements DisplayListener { 


            createStackOnDisplay(null, HOME_STACK_ID, Display.DEFAULT_DISPLAY);

            mHomeStack = mFocusedStack = mLastFocusedStack = getStack(HOME_STACK_ID);



            mInputManagerInternal = LocalServices.getService(InputManagerInternal.class);

        }

    }
@@ -2941,7 +2949,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        }



        @Override

        public void attachToDisplay(int displayId) throws RemoteException {

        public void attachToDisplay(int displayId) {

            synchronized (mService) {

                ActivityDisplay activityDisplay = mActivityDisplays.get(displayId);

                if (activityDisplay == null) {
@@ -2952,13 +2960,28 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        }



        @Override

        public int getDisplayId() throws RemoteException {

        public int getDisplayId() {

            if (mActivityDisplay != null) {

                return mActivityDisplay.mDisplayId;

            }

            return -1;

        }



        @Override

        public boolean injectEvent(InputEvent event) {

            final long origId = Binder.clearCallingIdentity();

            try {

                if (mActivityDisplay != null) {

                    return mInputManagerInternal.injectInputEvent(event,

                            mActivityDisplay.mDisplayId,

                            InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);

                }

                return false;

            } finally {

                Binder.restoreCallingIdentity(origId);

            }

        }



        private void detachLocked() {

            if (DEBUG_STACK) Slog.d(TAG, "detachLocked: " + this + " from display="

                    + mActivityDisplay + " Callers=" + Debug.getCallers(2));
@@ -2972,7 +2995,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        }



        @Override

        public void detachFromDisplay() throws RemoteException {

        public void detachFromDisplay() {

            synchronized (mService) {

                detachLocked();

            }

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

+13 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.input;



import android.view.Display;

import com.android.internal.R;

import com.android.internal.util.XmlUtils;

import com.android.server.DisplayThread;
@@ -170,7 +171,7 @@ public class InputManagerService extends IInputManager.Stub 
            InputWindowHandle inputWindowHandle, boolean monitor);

    private static native void nativeUnregisterInputChannel(long ptr, InputChannel inputChannel);

    private static native void nativeSetInputFilterEnabled(long ptr, boolean enable);

    private static native int nativeInjectInputEvent(long ptr, InputEvent event,

    private static native int nativeInjectInputEvent(long ptr, InputEvent event, int displayId,

            int injectorPid, int injectorUid, int syncMode, int timeoutMillis,

            int policyFlags);

    private static native void nativeSetInputWindows(long ptr, InputWindowHandle[] windowHandles);
@@ -509,6 +510,10 @@ public class InputManagerService extends IInputManager.Stub 


    @Override // Binder call

    public boolean injectInputEvent(InputEvent event, int mode) {

        return injectInputEventInternal(event, Display.DEFAULT_DISPLAY, mode);

    }



    private boolean injectInputEventInternal(InputEvent event, int displayId, int mode) {

        if (event == null) {

            throw new IllegalArgumentException("event must not be null");

        }
@@ -523,7 +528,7 @@ public class InputManagerService extends IInputManager.Stub 
        final long ident = Binder.clearCallingIdentity();

        final int result;

        try {

            result = nativeInjectInputEvent(mPtr, event, pid, uid, mode,

            result = nativeInjectInputEvent(mPtr, event, displayId, pid, uid, mode,

                    INJECTION_TIMEOUT_MILLIS, WindowManagerPolicy.FLAG_DISABLE_KEY_REPEAT);

        } finally {

            Binder.restoreCallingIdentity(ident);
@@ -1588,7 +1593,7 @@ public class InputManagerService extends IInputManager.Stub 


            synchronized (mInputFilterLock) {

                if (!mDisconnected) {

                    nativeInjectInputEvent(mPtr, event, 0, 0,

                    nativeInjectInputEvent(mPtr, event, Display.DEFAULT_DISPLAY, 0, 0,

                            InputManager.INJECT_INPUT_EVENT_MODE_ASYNC, 0,

                            policyFlags | WindowManagerPolicy.FLAG_FILTERED);

                }
@@ -1685,5 +1690,10 @@ public class InputManagerService extends IInputManager.Stub 
                DisplayViewport defaultViewport, DisplayViewport externalTouchViewport) {

            setDisplayViewportsInternal(defaultViewport, externalTouchViewport);

        }



        @Override

        public boolean injectInputEvent(InputEvent event, int displayId, int mode) {

            return injectInputEventInternal(event, displayId, mode);

        }

    }

}