This CL adds: 1) Adds uniqueId (protected via system/sig permission) to virtual displays. 2) Add support for N virtual display viewports into inputflinger. 3) Set the virtual display's viewports in inputflinger if it has the uniqueId value set to non-null. (a) Moving the new viewport from java to native inputflinger and (b) adding "uniqueId" value to viewports makes up the great majority of this change. 4) From the inputflinger side, we also read in a new value from the input device configuration files called 'touch.displayId'. 5) When touch.displayId and the virtual display's uniqueId match, inputflinger links the two. Test: Start VR and ensure that the virtual viewport shows up when running 'adb shell dump input". Run a VR app, and ensure that the virtual input device is associated with the new virtual viewport. Test: com.android.server.display.DisplayManagerServiceTest Bug: 36051620 Change-Id: Ic2117eb8e19f7f3c59687160591f8bc6692c1f12 Merged-In: Ic2117eb8e19f7f3c59687160591f8bc6692c1f12
97 lines
4.2 KiB
C++
97 lines
4.2 KiB
C++
/*
|
|
* Copyright (C) 2009 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.
|
|
*/
|
|
|
|
#include "JNIHelp.h"
|
|
#include "jni.h"
|
|
#include "utils/Log.h"
|
|
#include "utils/misc.h"
|
|
|
|
namespace android {
|
|
int register_android_server_AlarmManagerService(JNIEnv* env);
|
|
int register_android_server_BatteryStatsService(JNIEnv* env);
|
|
int register_android_server_ConsumerIrService(JNIEnv *env);
|
|
int register_android_server_InputApplicationHandle(JNIEnv* env);
|
|
int register_android_server_InputWindowHandle(JNIEnv* env);
|
|
int register_android_server_InputManager(JNIEnv* env);
|
|
int register_android_server_LightsService(JNIEnv* env);
|
|
int register_android_server_PowerManagerService(JNIEnv* env);
|
|
int register_android_server_storage_AppFuse(JNIEnv* env);
|
|
int register_android_server_SerialService(JNIEnv* env);
|
|
int register_android_server_SystemServer(JNIEnv* env);
|
|
int register_android_server_UsbDeviceManager(JNIEnv* env);
|
|
int register_android_server_UsbMidiDevice(JNIEnv* env);
|
|
int register_android_server_UsbHostManager(JNIEnv* env);
|
|
int register_android_server_vr_VrManagerService(JNIEnv* env);
|
|
int register_android_server_VibratorService(JNIEnv* env);
|
|
int register_android_server_location_ContextHubService(JNIEnv* env);
|
|
int register_android_server_location_GnssLocationProvider(JNIEnv* env);
|
|
int register_android_server_connectivity_Vpn(JNIEnv* env);
|
|
int register_android_server_hdmi_HdmiCecController(JNIEnv* env);
|
|
int register_android_server_tv_TvUinputBridge(JNIEnv* env);
|
|
int register_android_server_tv_TvInputHal(JNIEnv* env);
|
|
int register_android_server_PersistentDataBlockService(JNIEnv* env);
|
|
int register_android_server_Watchdog(JNIEnv* env);
|
|
int register_android_server_HardwarePropertiesManagerService(JNIEnv* env);
|
|
int register_android_server_SyntheticPasswordManager(JNIEnv* env);
|
|
int register_android_server_GraphicsStatsService(JNIEnv* env);
|
|
int register_android_hardware_display_DisplayViewport(JNIEnv* env);
|
|
};
|
|
|
|
using namespace android;
|
|
|
|
extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */)
|
|
{
|
|
JNIEnv* env = NULL;
|
|
jint result = -1;
|
|
|
|
if (vm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) {
|
|
ALOGE("GetEnv failed!");
|
|
return result;
|
|
}
|
|
ALOG_ASSERT(env, "Could not retrieve the env!");
|
|
|
|
register_android_server_PowerManagerService(env);
|
|
register_android_server_SerialService(env);
|
|
register_android_server_InputApplicationHandle(env);
|
|
register_android_server_InputWindowHandle(env);
|
|
register_android_server_InputManager(env);
|
|
register_android_server_LightsService(env);
|
|
register_android_server_AlarmManagerService(env);
|
|
register_android_server_UsbDeviceManager(env);
|
|
register_android_server_UsbMidiDevice(env);
|
|
register_android_server_UsbHostManager(env);
|
|
register_android_server_vr_VrManagerService(env);
|
|
register_android_server_VibratorService(env);
|
|
register_android_server_SystemServer(env);
|
|
register_android_server_location_ContextHubService(env);
|
|
register_android_server_location_GnssLocationProvider(env);
|
|
register_android_server_connectivity_Vpn(env);
|
|
register_android_server_ConsumerIrService(env);
|
|
register_android_server_BatteryStatsService(env);
|
|
register_android_server_hdmi_HdmiCecController(env);
|
|
register_android_server_tv_TvUinputBridge(env);
|
|
register_android_server_tv_TvInputHal(env);
|
|
register_android_server_PersistentDataBlockService(env);
|
|
register_android_server_Watchdog(env);
|
|
register_android_server_HardwarePropertiesManagerService(env);
|
|
register_android_server_storage_AppFuse(env);
|
|
register_android_server_SyntheticPasswordManager(env);
|
|
register_android_server_GraphicsStatsService(env);
|
|
register_android_hardware_display_DisplayViewport(env);
|
|
|
|
return JNI_VERSION_1_4;
|
|
}
|