sdk: Remove touch HIDL support (442a3136) · Commits · e / os / android_lineage-sdk

Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,6 @@ java_defaults {
		"vendor.lineage.livedisplay-V2.0-java",
		"vendor.lineage.livedisplay-V2.1-java",
		"vendor.lineage.touch-V1-java",
		"vendor.lineage.touch-V1.0-java",
		],
		}

sdk/src/java/lineageos/hardware/HIDLHelper.java

+1 −21

Original line number	Diff line number	Diff line
		/*
		* SPDX-FileCopyrightText: 2019 The LineageOS Project
		* SPDX-FileCopyrightText: 2019-2025 The LineageOS Project
		* SPDX-License-Identifier: Apache-2.0
		*/

		@@ -49,24 +49,4 @@ class HIDLHelper {
		static Range<Float> fromHIDLRange(vendor.lineage.livedisplay.V2_0.FloatRange range) {
		return new Range(range.min, range.max);
		}

		static TouchscreenGesture[] fromHIDLGestures(
		ArrayList<vendor.lineage.touch.V1_0.Gesture> gestures) {
		int size = gestures.size();
		TouchscreenGesture[] r = new TouchscreenGesture[size];
		for (int i = 0; i < size; i++) {
		vendor.lineage.touch.V1_0.Gesture g = gestures.get(i);
		r[i] = new TouchscreenGesture(g.id, g.name, g.keycode);
		}
		return r;
		}

		static vendor.lineage.touch.V1_0.Gesture toHIDLGesture(TouchscreenGesture gesture) {
		vendor.lineage.touch.V1_0.Gesture g = new vendor.lineage.touch.V1_0.Gesture();
		g.id = gesture.id;
		g.name = gesture.name;
		g.keycode = gesture.keycode;
		return g;
		}

		}

sdk/src/java/lineageos/hardware/LineageHardwareManager.java

+26 −110

Original line number	Diff line number	Diff line
		@@ -29,6 +29,12 @@ import vendor.lineage.livedisplay.V2_0.IPictureAdjustment;
		import vendor.lineage.livedisplay.V2_0.IReadingEnhancement;
		import vendor.lineage.livedisplay.V2_0.ISunlightEnhancement;
		import vendor.lineage.livedisplay.V2_1.IAntiFlicker;
		import vendor.lineage.touch.IGloveMode;
		import vendor.lineage.touch.IHighTouchPollingRate;
		import vendor.lineage.touch.IKeyDisabler;
		import vendor.lineage.touch.IKeySwapper;
		import vendor.lineage.touch.IStylusMode;
		import vendor.lineage.touch.ITouchscreenGesture;

		import java.lang.reflect.Field;
		import java.util.ArrayList;
		@@ -279,22 +285,22 @@ public final class LineageHardwareManager {
		switch (feature) {
		case FEATURE_HIGH_TOUCH_POLLING_RATE:
		return ServiceManager.waitForDeclaredService(
		vendor.lineage.touch.IHighTouchPollingRate.DESCRIPTOR + "/default");
		IHighTouchPollingRate.DESCRIPTOR + "/default");
		case FEATURE_HIGH_TOUCH_SENSITIVITY:
		return ServiceManager.waitForDeclaredService(
		vendor.lineage.touch.IGloveMode.DESCRIPTOR + "/default");
		IGloveMode.DESCRIPTOR + "/default");
		case FEATURE_KEY_DISABLE:
		return ServiceManager.waitForDeclaredService(
		vendor.lineage.touch.IKeyDisabler.DESCRIPTOR + "/default");
		IKeyDisabler.DESCRIPTOR + "/default");
		case FEATURE_KEY_SWAP:
		return ServiceManager.waitForDeclaredService(
		vendor.lineage.touch.IKeySwapper.DESCRIPTOR + "/default");
		IKeySwapper.DESCRIPTOR + "/default");
		case FEATURE_TOUCH_HOVERING:
		return ServiceManager.waitForDeclaredService(
		vendor.lineage.touch.IStylusMode.DESCRIPTOR + "/default");
		IStylusMode.DESCRIPTOR + "/default");
		case FEATURE_TOUCHSCREEN_GESTURES:
		return ServiceManager.waitForDeclaredService(
		vendor.lineage.touch.ITouchscreenGesture.DESCRIPTOR + "/default");
		ITouchscreenGesture.DESCRIPTOR + "/default");
		}
		return null;
		}
		@@ -322,18 +328,6 @@ public final class LineageHardwareManager {
		return IReadingEnhancement.getService(true);
		case FEATURE_SUNLIGHT_ENHANCEMENT:
		return ISunlightEnhancement.getService(true);
		case FEATURE_HIGH_TOUCH_POLLING_RATE:
		return vendor.lineage.touch.V1_0.IHighTouchPollingRate.getService(true);
		case FEATURE_HIGH_TOUCH_SENSITIVITY:
		return vendor.lineage.touch.V1_0.IGloveMode.getService(true);
		case FEATURE_KEY_DISABLE:
		return vendor.lineage.touch.V1_0.IKeyDisabler.getService(true);
		case FEATURE_KEY_SWAP:
		return vendor.lineage.touch.V1_0.IKeySwapper.getService(true);
		case FEATURE_TOUCH_HOVERING:
		return vendor.lineage.touch.V1_0.IStylusMode.getService(true);
		case FEATURE_TOUCHSCREEN_GESTURES:
		return vendor.lineage.touch.V1_0.ITouchscreenGesture.getService(true);
		}
		} catch (NoSuchElementException \| RemoteException e) {
		}
		@@ -379,25 +373,15 @@ public final class LineageHardwareManager {
		IBinder b = mAIDLMap.get(feature);
		switch (feature) {
		case FEATURE_HIGH_TOUCH_POLLING_RATE:
		vendor.lineage.touch.IHighTouchPollingRate highTouchPollingRate =
		vendor.lineage.touch.IHighTouchPollingRate.Stub.asInterface(b);
		return highTouchPollingRate.getEnabled();
		return IHighTouchPollingRate.Stub.asInterface(b).getEnabled();
		case FEATURE_HIGH_TOUCH_SENSITIVITY:
		vendor.lineage.touch.IGloveMode gloveMode =
		vendor.lineage.touch.IGloveMode.Stub.asInterface(b);
		return gloveMode.getEnabled();
		return IGloveMode.Stub.asInterface(b).getEnabled();
		case FEATURE_KEY_DISABLE:
		vendor.lineage.touch.IKeyDisabler keyDisabler =
		vendor.lineage.touch.IKeyDisabler.Stub.asInterface(b);
		return keyDisabler.getEnabled();
		return IKeyDisabler.Stub.asInterface(b).getEnabled();
		case FEATURE_KEY_SWAP:
		vendor.lineage.touch.IKeySwapper keySwapper =
		vendor.lineage.touch.IKeySwapper.Stub.asInterface(b);
		return keySwapper.getEnabled();
		return IKeySwapper.Stub.asInterface(b).getEnabled();
		case FEATURE_TOUCH_HOVERING:
		vendor.lineage.touch.IStylusMode stylusMode =
		vendor.lineage.touch.IStylusMode.Stub.asInterface(b);
		return stylusMode.getEnabled();
		return IStylusMode.Stub.asInterface(b).getEnabled();
		}
		} else if (isSupportedHIDL(feature)) {
		IBase obj = mHIDLMap.get(feature);
		@@ -414,29 +398,9 @@ public final class LineageHardwareManager {
		case FEATURE_COLOR_ENHANCEMENT:
		IColorEnhancement colorEnhancement = (IColorEnhancement) obj;
		return colorEnhancement.isEnabled();
		case FEATURE_HIGH_TOUCH_POLLING_RATE:
		vendor.lineage.touch.V1_0.IHighTouchPollingRate highTouchPollingRate =
		(vendor.lineage.touch.V1_0.IHighTouchPollingRate) obj;
		return highTouchPollingRate.isEnabled();
		case FEATURE_HIGH_TOUCH_SENSITIVITY:
		vendor.lineage.touch.V1_0.IGloveMode gloveMode =
		(vendor.lineage.touch.V1_0.IGloveMode) obj;
		return gloveMode.isEnabled();
		case FEATURE_KEY_DISABLE:
		vendor.lineage.touch.V1_0.IKeyDisabler keyDisabler =
		(vendor.lineage.touch.V1_0.IKeyDisabler) obj;
		return keyDisabler.isEnabled();
		case FEATURE_KEY_SWAP:
		vendor.lineage.touch.V1_0.IKeySwapper keySwapper =
		(vendor.lineage.touch.V1_0.IKeySwapper) obj;
		return keySwapper.isEnabled();
		case FEATURE_SUNLIGHT_ENHANCEMENT:
		ISunlightEnhancement sunlightEnhancement = (ISunlightEnhancement) obj;
		return sunlightEnhancement.isEnabled();
		case FEATURE_TOUCH_HOVERING:
		vendor.lineage.touch.V1_0.IStylusMode stylusMode =
		(vendor.lineage.touch.V1_0.IStylusMode) obj;
		return stylusMode.isEnabled();
		case FEATURE_READING_ENHANCEMENT:
		IReadingEnhancement readingEnhancement = (IReadingEnhancement) obj;
		return readingEnhancement.isEnabled();
		@@ -469,29 +433,19 @@ public final class LineageHardwareManager {
		IBinder b = mAIDLMap.get(feature);
		switch (feature) {
		case FEATURE_HIGH_TOUCH_POLLING_RATE:
		vendor.lineage.touch.IHighTouchPollingRate highTouchPollingRate =
		vendor.lineage.touch.IHighTouchPollingRate.Stub.asInterface(b);
		highTouchPollingRate.setEnabled(enable);
		IHighTouchPollingRate.Stub.asInterface(b).setEnabled(enable);
		break;
		case FEATURE_HIGH_TOUCH_SENSITIVITY:
		vendor.lineage.touch.IGloveMode gloveMode =
		vendor.lineage.touch.IGloveMode.Stub.asInterface(b);
		gloveMode.setEnabled(enable);
		IGloveMode.Stub.asInterface(b).setEnabled(enable);
		break;
		case FEATURE_KEY_DISABLE:
		vendor.lineage.touch.IKeyDisabler keyDisabler =
		vendor.lineage.touch.IKeyDisabler.Stub.asInterface(b);
		keyDisabler.setEnabled(enable);
		IKeyDisabler.Stub.asInterface(b).setEnabled(enable);
		break;
		case FEATURE_KEY_SWAP:
		vendor.lineage.touch.IKeySwapper keySwapper =
		vendor.lineage.touch.IKeySwapper.Stub.asInterface(b);
		keySwapper.setEnabled(enable);
		IKeySwapper.Stub.asInterface(b).setEnabled(enable);
		break;
		case FEATURE_TOUCH_HOVERING:
		vendor.lineage.touch.IStylusMode stylusMode =
		vendor.lineage.touch.IStylusMode.Stub.asInterface(b);
		stylusMode.setEnabled(enable);
		IStylusMode.Stub.asInterface(b).setEnabled(enable);
		break;
		}
		return enable;
		@@ -511,29 +465,6 @@ public final class LineageHardwareManager {
		case FEATURE_COLOR_ENHANCEMENT:
		IColorEnhancement colorEnhancement = (IColorEnhancement) obj;
		return colorEnhancement.setEnabled(enable);
		case FEATURE_HIGH_TOUCH_POLLING_RATE:
		vendor.lineage.touch.V1_0.IHighTouchPollingRate highTouchPollingRate =
		(vendor.lineage.touch.V1_0.IHighTouchPollingRate) obj;
		return highTouchPollingRate.setEnabled(enable);
		case FEATURE_HIGH_TOUCH_SENSITIVITY:
		vendor.lineage.touch.V1_0.IGloveMode gloveMode =
		(vendor.lineage.touch.V1_0.IGloveMode) obj;
		return gloveMode.setEnabled(enable);
		case FEATURE_KEY_DISABLE:
		vendor.lineage.touch.V1_0.IKeyDisabler keyDisabler =
		(vendor.lineage.touch.V1_0.IKeyDisabler) obj;
		return keyDisabler.setEnabled(enable);
		case FEATURE_KEY_SWAP:
		vendor.lineage.touch.V1_0.IKeySwapper keySwapper =
		(vendor.lineage.touch.V1_0.IKeySwapper) obj;
		return keySwapper.setEnabled(enable);
		case FEATURE_SUNLIGHT_ENHANCEMENT:
		ISunlightEnhancement sunlightEnhancement = (ISunlightEnhancement) obj;
		return sunlightEnhancement.setEnabled(enable);
		case FEATURE_TOUCH_HOVERING:
		vendor.lineage.touch.V1_0.IStylusMode stylusMode =
		(vendor.lineage.touch.V1_0.IStylusMode) obj;
		return stylusMode.setEnabled(enable);
		case FEATURE_READING_ENHANCEMENT:
		IReadingEnhancement readingEnhancement = (IReadingEnhancement) obj;
		return readingEnhancement.setEnabled(enable);
		@@ -869,17 +800,10 @@ public final class LineageHardwareManager {
		public TouchscreenGesture[] getTouchscreenGestures() {
		try {
		if (isSupportedAIDL(FEATURE_TOUCHSCREEN_GESTURES)) {
		vendor.lineage.touch.ITouchscreenGesture touchscreenGesture =
		vendor.lineage.touch.ITouchscreenGesture.Stub.asInterface(
		ITouchscreenGesture touchscreenGesture = ITouchscreenGesture.Stub.asInterface(
		mAIDLMap.get(FEATURE_TOUCHSCREEN_GESTURES));
		return AIDLHelper.fromAIDLGestures(touchscreenGesture.getSupportedGestures());
		}
		if (isSupportedHIDL(FEATURE_TOUCHSCREEN_GESTURES)) {
		vendor.lineage.touch.V1_0.ITouchscreenGesture touchscreenGesture =
		(vendor.lineage.touch.V1_0.ITouchscreenGesture)
		mHIDLMap.get(FEATURE_TOUCHSCREEN_GESTURES);
		return HIDLHelper.fromHIDLGestures(touchscreenGesture.getSupportedGestures());
		}
		} catch (Exception e) {
		}
		return null;
		@@ -892,19 +816,11 @@ public final class LineageHardwareManager {
		TouchscreenGesture gesture, boolean state) {
		try {
		if (isSupportedAIDL(FEATURE_TOUCHSCREEN_GESTURES)) {
		vendor.lineage.touch.ITouchscreenGesture touchscreenGesture =
		vendor.lineage.touch.ITouchscreenGesture.Stub.asInterface(
		ITouchscreenGesture touchscreenGesture = ITouchscreenGesture.Stub.asInterface(
		mAIDLMap.get(FEATURE_TOUCHSCREEN_GESTURES));
		touchscreenGesture.setGestureEnabled(AIDLHelper.toAIDLGesture(gesture), state);
		return true;
		}
		if (isSupportedHIDL(FEATURE_TOUCHSCREEN_GESTURES)) {
		vendor.lineage.touch.V1_0.ITouchscreenGesture touchscreenGesture =
		(vendor.lineage.touch.V1_0.ITouchscreenGesture)
		mHIDLMap.get(FEATURE_TOUCHSCREEN_GESTURES);
		return touchscreenGesture.setGestureEnabled(
		HIDLHelper.toHIDLGesture(gesture), state);
		}
		} catch (Exception e) {
		}
		return false;