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

Commit 03c20bbf authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Remove InputForwarder"

parents 1ca52f00 c0240753

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ java_defaults { 
        "core/java/android/app/ITaskStackListener.aidl",

        "core/java/android/app/IBackupAgent.aidl",

        "core/java/android/app/IEphemeralResolver.aidl",

        "core/java/android/app/IInputForwarder.aidl",

        "core/java/android/app/IInstantAppResolver.aidl",

        "core/java/android/app/IInstrumentationWatcher.aidl",

        "core/java/android/app/INotificationManager.aidl",

config/hiddenapi-greylist.txt

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ Landroid/app/IAppTask;->getTaskInfo()Landroid/app/ActivityManager$RecentTaskInfo 
Landroid/app/IAssistDataReceiver$Stub;-><init>()V

Landroid/app/IAssistDataReceiver;->onHandleAssistData(Landroid/os/Bundle;)V

Landroid/app/IAssistDataReceiver;->onHandleAssistScreenshot(Landroid/graphics/Bitmap;)V

Landroid/app/IInputForwarder;->forwardEvent(Landroid/view/InputEvent;)Z

Landroid/app/IInstrumentationWatcher$Stub;-><init>()V

Landroid/app/IInstrumentationWatcher;->instrumentationStatus(Landroid/content/ComponentName;ILandroid/os/Bundle;)V

Landroid/app/INotificationManager$Stub$Proxy;-><init>(Landroid/os/IBinder;)V

core/java/android/app/IInputForwarder.aidl

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/**

 * Copyright (c) 2017, 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.app;



import android.view.InputEvent;



/**

 * Forwards input events into owned activity container, used in {@link android.app.ActivityView}.

 * To forward input to other apps {@link android.Manifest.permission.INJECT_EVENTS} permission is

 * required.

 * @hide

 */

interface IInputForwarder {

    boolean forwardEvent(in InputEvent event);

}
 
 No newline at end of file

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

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


package android.hardware.input;



import android.app.IInputForwarder;

import android.hardware.input.InputDeviceIdentifier;

import android.hardware.input.KeyboardLayout;

import android.hardware.input.IInputDevicesChangedListener;
@@ -82,7 +81,4 @@ interface IInputManager { 
    void setCustomPointerIcon(in PointerIcon icon);



    void requestPointerCapture(IBinder windowToken, boolean enabled);



    /** Create input forwarder to deliver touch events to owned display. */

    IInputForwarder createInputForwarder(int displayId);

}

core/java/android/hardware/input/InputManager.java

+0 −21
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.annotation.SdkConstant; 
import android.annotation.SdkConstant.SdkConstantType;

import android.annotation.SystemService;

import android.annotation.UnsupportedAppUsage;

import android.app.IInputForwarder;

import android.content.Context;

import android.media.AudioAttributes;

import android.os.Binder;
@@ -934,26 +933,6 @@ public final class InputManager { 
        }

    }





    /**

     * Create an {@link IInputForwarder} targeted to provided display.

     * {@link android.Manifest.permission.INJECT_EVENTS} permission is required to call this method.

     *

     * @param displayId Id of the target display where input events should be forwarded.

     *                  Display must exist and must be owned by the caller.

     * @return The forwarder instance.

     *

     * @hide

     */

    @UnsupportedAppUsage

    public IInputForwarder createInputForwarder(int displayId) {

        try {

            return mIm.createInputForwarder(displayId);

        } catch (RemoteException ex) {

            throw ex.rethrowFromSystemServer();

        }

    }



    private void populateInputDevicesLocked() {

        if (mInputDevicesChangedListener == null) {

            final InputDevicesChangedListener listener = new InputDevicesChangedListener();