Merge "Fix touch reset when enable state is unchanged" (6c4e7e51) · Commits · e / os / android_frameworks_base

services/core/jni/com_android_server_input_InputManagerService.cpp

+8 −2

Original line number	Diff line number	Diff line
		@@ -1159,6 +1159,8 @@ void NativeInputManager::setTouchpadRightClickZoneEnabled(bool enabled) {
		}

		void NativeInputManager::setInputDeviceEnabled(uint32_t deviceId, bool enabled) {
		bool refresh = false;

		{ // acquire lock
		std::scoped_lock _l(mLock);

		@@ -1166,15 +1168,19 @@ void NativeInputManager::setInputDeviceEnabled(uint32_t deviceId, bool enabled)
		bool currentlyEnabled = it == mLocked.disabledInputDevices.end();
		if (!enabled && currentlyEnabled) {
		mLocked.disabledInputDevices.insert(deviceId);
		refresh = true;
		}
		if (enabled && !currentlyEnabled) {
		mLocked.disabledInputDevices.erase(deviceId);
		refresh = true;
		}
		} // release lock

		if (refresh) {
		mInputManager->getReader().requestRefreshConfiguration(
		InputReaderConfiguration::Change::ENABLED_STATE);
		}
		}

		void NativeInputManager::setShowTouches(bool enabled) {
		{ // acquire lock