9302c8796f
This change moves the cached window and application input state into the handle objects themselves. It simplifies the dispatcher somewhat because it no longer needs to fix up references to transient InputWindow objects each time the window list is updated. This change will also make it easier to optimize setInputWindows to avoid doing a lot of redundant data copying. In principle, only the modified fields need to be updated. However, for now we continue to update all fields in unison as before. It turns out that the input dispatcher was inappropriately retaining pointers to InputWindow objects within the mWindows InputWindow vector. This vector is copy-on-write so it is possible and the item pointers to change if an editing operation is performed on the vector when it does not exclusively own the underlying SharedBuffer. This bug was uncovered by a previous change that replaced calls to clear() and appendVector() with a simple use of operator= which caused the buffer to be shared. Consequently after editItemAt was called (which it shouldn't have, actually) the buffer was copied and the cached InputWindow pointers became invalid. Oops. This change fixes the problem. Change-Id: I0a259339a6015fcf9113dc4081a6875e047fd425
67 lines
2.5 KiB
C++
67 lines
2.5 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_BatteryService(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_UsbDeviceManager(JNIEnv* env);
|
|
int register_android_server_UsbHostManager(JNIEnv* env);
|
|
int register_android_server_VibratorService(JNIEnv* env);
|
|
int register_android_server_SystemServer(JNIEnv* env);
|
|
int register_android_server_location_GpsLocationProvider(JNIEnv* env);
|
|
int register_android_server_connectivity_Vpn(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) {
|
|
LOGE("GetEnv failed!");
|
|
return result;
|
|
}
|
|
LOG_ASSERT(env, "Could not retrieve the env!");
|
|
|
|
register_android_server_PowerManagerService(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_BatteryService(env);
|
|
register_android_server_UsbDeviceManager(env);
|
|
register_android_server_UsbHostManager(env);
|
|
register_android_server_VibratorService(env);
|
|
register_android_server_SystemServer(env);
|
|
register_android_server_location_GpsLocationProvider(env);
|
|
register_android_server_connectivity_Vpn(env);
|
|
|
|
return JNI_VERSION_1_4;
|
|
}
|