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

Remove NativeInputManager::isPerDisplayTouchModeEnabled

Browse Source 
NativeInputManager::isPerDisplayTouchModeEnabled is not referred
anywhere.

Fix: 274825843
Test: atest CtsInputTestCases:android.input.cts.TouchModeTest
Change-Id: Ia2900b42d1a449f2bd14d7e9d9f4aabc21b33333
This commit is contained in:
Antonio Kantek
2023-03-24 16:17:50 +00:00
parent 72a38fbbe4
commit bd992f5fca
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/core/jni/com_android_server_input_InputManagerService.cpp
View File

@@ -136,7 +136,7 @@ static struct {
jmethodID getContextForDisplay;
jmethodID notifyDropWindow;
jmethodID getParentSurfaceForPointers;
jmethodID isPerDisplayTouchModeEnabled;
jmethodID isStylusPointerIconEnabled;
} gServiceClassInfo;
static struct {
@@ -369,10 +369,6 @@ public:
virtual PointerIconStyle getCustomPointerIconId();
virtual void onPointerDisplayIdChanged(int32_t displayId, const FloatPoint& position);
/* --- If touch mode is enabled per display or global --- */
virtual bool isPerDisplayTouchModeEnabled();
private:
sp<InputManagerInterface> mInputManager;
@@ -1645,16 +1641,6 @@ void NativeInputManager::setStylusButtonMotionEventsEnabled(bool enabled) {
InputReaderConfiguration::CHANGE_STYLUS_BUTTON_REPORTING);
}
bool NativeInputManager::isPerDisplayTouchModeEnabled() {
JNIEnv* env = jniEnv();
jboolean enabled =
env->CallBooleanMethod(mServiceObj, gServiceClassInfo.isPerDisplayTouchModeEnabled);
if (checkAndClearExceptionFromCallback(env, "isPerDisplayTouchModeEnabled")) {
return false;
}
return static_cast<bool>(enabled);
}
FloatPoint NativeInputManager::getMouseCursorPosition() {
std::scoped_lock _l(mLock);
const auto pc = mLocked.pointerController.lock();
@@ -2837,8 +2823,8 @@ int register_android_server_InputManager(JNIEnv* env) {
GET_METHOD_ID(gServiceClassInfo.getParentSurfaceForPointers, clazz,
"getParentSurfaceForPointers", "(I)J");
GET_METHOD_ID(gServiceClassInfo.isPerDisplayTouchModeEnabled, clazz,
"isPerDisplayTouchModeEnabled", "()Z");
GET_METHOD_ID(gServiceClassInfo.isStylusPointerIconEnabled, clazz, "isStylusPointerIconEnabled",
"()Z");
// InputDevice