Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove InputForwarder"

Browse Source
This commit is contained in:
Tiger Huang
2019-02-19 07:18:41 +00:00
committed by Android (Google) Code Review
parent 1ca52f005a c0240753f0
commit 03c20bbf6e
7 changed files with 0 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -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",

1
config/hiddenapi-greylist.txt
View File

@@ -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

29
core/java/android/app/IInputForwarder.aidl
View File

@@ -1,29 +0,0 @@
/**
* 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);
}

4
core/java/android/hardware/input/IInputManager.aidl
View File

@@ -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);
}

21
core/java/android/hardware/input/InputManager.java
View File

@@ -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();

45
services/core/java/com/android/server/input/InputForwarder.java
View File

@@ -1,45 +0,0 @@
/*
* 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 com.android.server.input;
import android.app.IInputForwarder;
import android.hardware.input.InputManagerInternal;
import android.view.InputEvent;
import com.android.server.LocalServices;
import static android.hardware.input.InputManager.INJECT_INPUT_EVENT_MODE_ASYNC;
/**
* Basic implementation of {@link IInputForwarder}.
*/
class InputForwarder extends IInputForwarder.Stub {
private final InputManagerInternal mInputManagerInternal;
private final int mDisplayId;
InputForwarder(int displayId) {
mDisplayId = displayId;
mInputManagerInternal = LocalServices.getService(InputManagerInternal.class);
}
@Override
public boolean forwardEvent(InputEvent event) {
event.setDisplayId(mDisplayId);
return mInputManagerInternal.injectInputEvent(event, INJECT_INPUT_EVENT_MODE_ASYNC);
}
}

24
services/core/java/com/android/server/input/InputManagerService.java
View File

@@ -17,7 +17,6 @@
package com.android.server.input;
import android.annotation.NonNull;
import android.app.IInputForwarder;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
@@ -1685,29 +1684,6 @@ public class InputManagerService extends IInputManager.Stub
nativeMonitor(mPtr);
}
// Binder call
@Override
public IInputForwarder createInputForwarder(int displayId) throws RemoteException {
if (!checkCallingPermission(android.Manifest.permission.INJECT_EVENTS,
"createInputForwarder()")) {
throw new SecurityException("Requires INJECT_EVENTS permission");
}
final DisplayManager displayManager = mContext.getSystemService(DisplayManager.class);
final Display display = displayManager.getDisplay(displayId);
if (display == null) {
throw new IllegalArgumentException(
"Can't create input forwarder for non-existent displayId: " + displayId);
}
final int callingUid = Binder.getCallingUid();
final int displayOwnerUid = display.getOwnerUid();
if (callingUid != displayOwnerUid) {
throw new SecurityException(
"Only owner of the display can forward input events to it.");
}
return new InputForwarder(displayId);
}
// Native callback.
private void notifyConfigurationChanged(long whenNanos) {
mWindowManagerCallbacks.notifyConfigurationChanged();