Android/lineage-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sdk: Remove LiveDisplay HIDL support

Browse Source 
Change-Id: I6a4c4ef6a0d35ed4cdb4e12590c33a96fdee26a4
This commit is contained in:
Bruno Martins
2025-08-16 16:43:31 +01:00
committed by LuK1337
parent ff4852071d
commit 3831b612f3
3 changed files with 63 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.bp
View File

@@ -90,8 +90,6 @@ java_defaults {
static_libs: [
"vendor.lineage.health-V2-java",
"vendor.lineage.livedisplay-V1-java",
"vendor.lineage.livedisplay-V2.0-java",
"vendor.lineage.livedisplay-V2.1-java",
"vendor.lineage.touch-V1-java",
],
}

52
sdk/src/java/lineageos/hardware/HIDLHelper.java
View File

@@ -1,52 +0,0 @@
/*
* SPDX-FileCopyrightText: 2019-2025 The LineageOS Project
* SPDX-License-Identifier: Apache-2.0
*/
package lineageos.hardware;
import android.util.Range;
import java.util.ArrayList;
class HIDLHelper {
static DisplayMode[] fromHIDLModes(
ArrayList<vendor.lineage.livedisplay.V2_0.DisplayMode> modes) {
int size = modes.size();
DisplayMode[] r = new DisplayMode[size];
for (int i = 0; i < size; i++) {
vendor.lineage.livedisplay.V2_0.DisplayMode m = modes.get(i);
r[i] = new DisplayMode(m.id, m.name);
}
return r;
}
static DisplayMode fromHIDLMode(
vendor.lineage.livedisplay.V2_0.DisplayMode mode) {
return new DisplayMode(mode.id, mode.name);
}
static HSIC fromHIDLHSIC(vendor.lineage.livedisplay.V2_0.HSIC hsic) {
return new HSIC(hsic.hue, hsic.saturation, hsic.intensity,
hsic.contrast, hsic.saturationThreshold);
}
static vendor.lineage.livedisplay.V2_0.HSIC toHIDLHSIC(HSIC hsic) {
vendor.lineage.livedisplay.V2_0.HSIC h = new vendor.lineage.livedisplay.V2_0.HSIC();
h.hue = hsic.getHue();
h.saturation = hsic.getSaturation();
h.intensity = hsic.getIntensity();
h.contrast = hsic.getContrast();
h.saturationThreshold = hsic.getSaturationThreshold();
return h;
}
static Range<Integer> fromHIDLRange(vendor.lineage.livedisplay.V2_0.Range range) {
return new Range(range.min, range.max);
}
static Range<Float> fromHIDLRange(vendor.lineage.livedisplay.V2_0.FloatRange range) {
return new Range(range.min, range.max);
}
}

351
sdk/src/java/lineageos/hardware/LineageHardwareManager.java
View File

@@ -6,7 +6,6 @@
package lineageos.hardware;
import android.content.Context;
import android.hidl.base.V1_0.IBase;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.ServiceManager;
@@ -15,10 +14,19 @@ import android.util.Log;
import android.util.Range;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils;
import lineageos.app.LineageContextConstants;
import vendor.lineage.livedisplay.IAdaptiveBacklight;
import vendor.lineage.livedisplay.IAntiFlicker;
import vendor.lineage.livedisplay.IAutoContrast;
import vendor.lineage.livedisplay.IColorBalance;
import vendor.lineage.livedisplay.IColorEnhancement;
import vendor.lineage.livedisplay.IDisplayColorCalibration;
import vendor.lineage.livedisplay.IDisplayModes;
import vendor.lineage.livedisplay.IPictureAdjustment;
import vendor.lineage.livedisplay.IReadingEnhancement;
import vendor.lineage.livedisplay.ISunlightEnhancement;
import vendor.lineage.touch.IGloveMode;
import vendor.lineage.touch.IHighTouchPollingRate;
import vendor.lineage.touch.IKeyDisabler;
@@ -31,7 +39,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.NoSuchElementException;
/**
* Manages access to LineageOS hardware extensions
@@ -173,10 +180,7 @@ public final class LineageHardwareManager {
private final ArrayMap<String, String> mDisplayModeMappings = new ArrayMap<String, String>();
private final boolean mFilterDisplayModes;
// AIDL hals
private HashMap<Integer, IBinder> mAIDLMap = new HashMap<Integer, IBinder>();
// HIDL hals
private HashMap<Integer, IBase> mHIDLMap = new HashMap<Integer, IBase>();
/**
* @hide to prevent subclassing from outside of the framework
@@ -244,7 +248,7 @@ public final class LineageHardwareManager {
* @return true if the feature is supported, false otherwise.
*/
public boolean isSupported(int feature) {
return isSupportedAIDL(feature) || isSupportedHIDL(feature) || isSupportedHWC2(feature);
return isSupportedAIDL(feature) || isSupportedHWC2(feature);
}
private boolean isSupportedAIDL(int feature) {
@@ -254,13 +258,6 @@ public final class LineageHardwareManager {
return mAIDLMap.get(feature) != null;
}
private boolean isSupportedHIDL(int feature) {
if (!mHIDLMap.containsKey(feature)) {
mHIDLMap.put(feature, getHIDLService(feature));
}
return mHIDLMap.get(feature) != null;
}
private boolean isSupportedHWC2(int feature) {
try {
if (checkService()) {
@@ -275,25 +272,25 @@ public final class LineageHardwareManager {
switch (feature) {
case FEATURE_ADAPTIVE_BACKLIGHT:
return ServiceManager.waitForDeclaredService(
vendor.lineage.livedisplay.IAdaptiveBacklight.DESCRIPTOR + "/default");
IAdaptiveBacklight.DESCRIPTOR + "/default");
case FEATURE_ANTI_FLICKER:
return ServiceManager.waitForDeclaredService(
vendor.lineage.livedisplay.IAntiFlicker.DESCRIPTOR + "/default");
IAntiFlicker.DESCRIPTOR + "/default");
case FEATURE_AUTO_CONTRAST:
return ServiceManager.waitForDeclaredService(
vendor.lineage.livedisplay.IAutoContrast.DESCRIPTOR + "/default");
IAutoContrast.DESCRIPTOR + "/default");
case FEATURE_COLOR_BALANCE:
return ServiceManager.waitForDeclaredService(
vendor.lineage.livedisplay.IColorBalance.DESCRIPTOR + "/default");
IColorBalance.DESCRIPTOR + "/default");
case FEATURE_COLOR_ENHANCEMENT:
return ServiceManager.waitForDeclaredService(
vendor.lineage.livedisplay.IColorEnhancement.DESCRIPTOR + "/default");
IColorEnhancement.DESCRIPTOR + "/default");
case FEATURE_DISPLAY_COLOR_CALIBRATION:
return ServiceManager.waitForDeclaredService(
vendor.lineage.livedisplay.IDisplayColorCalibration.DESCRIPTOR + "/default");
IDisplayColorCalibration.DESCRIPTOR + "/default");
case FEATURE_DISPLAY_MODES:
return ServiceManager.waitForDeclaredService(
vendor.lineage.livedisplay.IDisplayModes.DESCRIPTOR + "/default");
IDisplayModes.DESCRIPTOR + "/default");
case FEATURE_HIGH_TOUCH_POLLING_RATE:
return ServiceManager.waitForDeclaredService(
IHighTouchPollingRate.DESCRIPTOR + "/default");
@@ -308,13 +305,13 @@ public final class LineageHardwareManager {
IKeySwapper.DESCRIPTOR + "/default");
case FEATURE_PICTURE_ADJUSTMENT:
return ServiceManager.waitForDeclaredService(
vendor.lineage.livedisplay.IPictureAdjustment.DESCRIPTOR + "/default");
IPictureAdjustment.DESCRIPTOR + "/default");
case FEATURE_READING_ENHANCEMENT:
return ServiceManager.waitForDeclaredService(
vendor.lineage.livedisplay.IReadingEnhancement.DESCRIPTOR + "/default");
IReadingEnhancement.DESCRIPTOR + "/default");
case FEATURE_SUNLIGHT_ENHANCEMENT:
return ServiceManager.waitForDeclaredService(
vendor.lineage.livedisplay.ISunlightEnhancement.DESCRIPTOR + "/default");
ISunlightEnhancement.DESCRIPTOR + "/default");
case FEATURE_TOUCH_HOVERING:
return ServiceManager.waitForDeclaredService(
IStylusMode.DESCRIPTOR + "/default");
@@ -325,35 +322,6 @@ public final class LineageHardwareManager {
return null;
}
private IBase getHIDLService(int feature) {
try {
switch (feature) {
case FEATURE_ADAPTIVE_BACKLIGHT:
return vendor.lineage.livedisplay.V2_0.IAdaptiveBacklight.getService(true);
case FEATURE_ANTI_FLICKER:
return vendor.lineage.livedisplay.V2_1.IAntiFlicker.getService(true);
case FEATURE_AUTO_CONTRAST:
return vendor.lineage.livedisplay.V2_0.IAutoContrast.getService(true);
case FEATURE_COLOR_BALANCE:
return vendor.lineage.livedisplay.V2_0.IColorBalance.getService(true);
case FEATURE_COLOR_ENHANCEMENT:
return vendor.lineage.livedisplay.V2_0.IColorEnhancement.getService(true);
case FEATURE_DISPLAY_COLOR_CALIBRATION:
return vendor.lineage.livedisplay.V2_0.IDisplayColorCalibration.getService(true);
case FEATURE_DISPLAY_MODES:
return vendor.lineage.livedisplay.V2_0.IDisplayModes.getService(true);
case FEATURE_PICTURE_ADJUSTMENT:
return vendor.lineage.livedisplay.V2_0.IPictureAdjustment.getService(true);
case FEATURE_READING_ENHANCEMENT:
return vendor.lineage.livedisplay.V2_0.IReadingEnhancement.getService(true);
case FEATURE_SUNLIGHT_ENHANCEMENT:
return vendor.lineage.livedisplay.V2_0.ISunlightEnhancement.getService(true);
}
} catch (NoSuchElementException | RemoteException e) {
}
return null;
}
/**
* String version for preference constraints
*
@@ -393,21 +361,13 @@ public final class LineageHardwareManager {
IBinder b = mAIDLMap.get(feature);
switch (feature) {
case FEATURE_ADAPTIVE_BACKLIGHT:
vendor.lineage.livedisplay.IAdaptiveBacklight adaptiveBacklight =
vendor.lineage.livedisplay.IAdaptiveBacklight.Stub.asInterface(b);
return adaptiveBacklight.getEnabled();
return IAdaptiveBacklight.Stub.asInterface(b).getEnabled();
case FEATURE_ANTI_FLICKER:
vendor.lineage.livedisplay.IAntiFlicker antiFlicker =
vendor.lineage.livedisplay.IAntiFlicker.Stub.asInterface(b);
return antiFlicker.getEnabled();
return IAntiFlicker.Stub.asInterface(b).getEnabled();
case FEATURE_AUTO_CONTRAST:
vendor.lineage.livedisplay.IAutoContrast autoContrast =
vendor.lineage.livedisplay.IAutoContrast.Stub.asInterface(b);
return autoContrast.getEnabled();
return IAutoContrast.Stub.asInterface(b).getEnabled();
case FEATURE_COLOR_ENHANCEMENT:
vendor.lineage.livedisplay.IColorEnhancement colorEnhancement =
vendor.lineage.livedisplay.IColorEnhancement.Stub.asInterface(b);
return colorEnhancement.getEnabled();
return IColorEnhancement.Stub.asInterface(b).getEnabled();
case FEATURE_HIGH_TOUCH_POLLING_RATE:
return IHighTouchPollingRate.Stub.asInterface(b).getEnabled();
case FEATURE_HIGH_TOUCH_SENSITIVITY:
@@ -417,44 +377,12 @@ public final class LineageHardwareManager {
case FEATURE_KEY_SWAP:
return IKeySwapper.Stub.asInterface(b).getEnabled();
case FEATURE_READING_ENHANCEMENT:
vendor.lineage.livedisplay.IReadingEnhancement readingEnhancement =
vendor.lineage.livedisplay.IReadingEnhancement.Stub.asInterface(b);
return readingEnhancement.getEnabled();
return IReadingEnhancement.Stub.asInterface(b).getEnabled();
case FEATURE_SUNLIGHT_ENHANCEMENT:
vendor.lineage.livedisplay.ISunlightEnhancement sunlightEnhancement =
vendor.lineage.livedisplay.ISunlightEnhancement.Stub.asInterface(b);
return sunlightEnhancement.getEnabled();
return ISunlightEnhancement.Stub.asInterface(b).getEnabled();
case FEATURE_TOUCH_HOVERING:
return IStylusMode.Stub.asInterface(b).getEnabled();
}
} else if (isSupportedHIDL(feature)) {
IBase obj = mHIDLMap.get(feature);
switch (feature) {
case FEATURE_ADAPTIVE_BACKLIGHT:
vendor.lineage.livedisplay.V2_0.IAdaptiveBacklight adaptiveBacklight =
(vendor.lineage.livedisplay.V2_0.IAdaptiveBacklight) obj;
return adaptiveBacklight.isEnabled();
case FEATURE_ANTI_FLICKER:
vendor.lineage.livedisplay.V2_1.IAntiFlicker antiFlicker =
(vendor.lineage.livedisplay.V2_1.IAntiFlicker) obj;
return antiFlicker.isEnabled();
case FEATURE_AUTO_CONTRAST:
vendor.lineage.livedisplay.V2_0.IAutoContrast autoContrast =
(vendor.lineage.livedisplay.V2_0.IAutoContrast) obj;
return autoContrast.isEnabled();
case FEATURE_COLOR_ENHANCEMENT:
vendor.lineage.livedisplay.V2_0.IColorEnhancement colorEnhancement =
(vendor.lineage.livedisplay.V2_0.IColorEnhancement) obj;
return colorEnhancement.isEnabled();
case FEATURE_SUNLIGHT_ENHANCEMENT:
vendor.lineage.livedisplay.V2_0.ISunlightEnhancement sunlightEnhancement =
(vendor.lineage.livedisplay.V2_0.ISunlightEnhancement) obj;
return sunlightEnhancement.isEnabled();
case FEATURE_READING_ENHANCEMENT:
vendor.lineage.livedisplay.V2_0.IReadingEnhancement readingEnhancement =
(vendor.lineage.livedisplay.V2_0.IReadingEnhancement) obj;
return readingEnhancement.isEnabled();
}
} else if (checkService()) {
return sService.get(feature);
}
@@ -483,24 +411,16 @@ public final class LineageHardwareManager {
IBinder b = mAIDLMap.get(feature);
switch (feature) {
case FEATURE_ADAPTIVE_BACKLIGHT:
vendor.lineage.livedisplay.IAdaptiveBacklight adaptiveBacklight =
vendor.lineage.livedisplay.IAdaptiveBacklight.Stub.asInterface(b);
adaptiveBacklight.setEnabled(enable);
IAdaptiveBacklight.Stub.asInterface(b).setEnabled(enable);
break;
case FEATURE_ANTI_FLICKER:
vendor.lineage.livedisplay.IAntiFlicker antiFlicker =
vendor.lineage.livedisplay.IAntiFlicker.Stub.asInterface(b);
antiFlicker.setEnabled(enable);
IAntiFlicker.Stub.asInterface(b).setEnabled(enable);
break;
case FEATURE_AUTO_CONTRAST:
vendor.lineage.livedisplay.IAutoContrast autoContrast =
vendor.lineage.livedisplay.IAutoContrast.Stub.asInterface(b);
autoContrast.setEnabled(enable);
IAutoContrast.Stub.asInterface(b).setEnabled(enable);
break;
case FEATURE_COLOR_ENHANCEMENT:
vendor.lineage.livedisplay.IColorEnhancement colorEnhancement =
vendor.lineage.livedisplay.IColorEnhancement.Stub.asInterface(b);
colorEnhancement.setEnabled(enable);
IColorEnhancement.Stub.asInterface(b).setEnabled(enable);
break;
case FEATURE_HIGH_TOUCH_POLLING_RATE:
IHighTouchPollingRate.Stub.asInterface(b).setEnabled(enable);
@@ -515,49 +435,16 @@ public final class LineageHardwareManager {
IKeySwapper.Stub.asInterface(b).setEnabled(enable);
break;
case FEATURE_READING_ENHANCEMENT:
vendor.lineage.livedisplay.IReadingEnhancement readingEnhancement =
vendor.lineage.livedisplay.IReadingEnhancement.Stub.asInterface(b);
readingEnhancement.setEnabled(enable);
IReadingEnhancement.Stub.asInterface(b).setEnabled(enable);
break;
case FEATURE_SUNLIGHT_ENHANCEMENT:
vendor.lineage.livedisplay.ISunlightEnhancement sunlightEnhancement =
vendor.lineage.livedisplay.ISunlightEnhancement.Stub.asInterface(b);
sunlightEnhancement.setEnabled(enable);
ISunlightEnhancement.Stub.asInterface(b).setEnabled(enable);
break;
case FEATURE_TOUCH_HOVERING:
IStylusMode.Stub.asInterface(b).setEnabled(enable);
break;
}
return enable;
}
if (isSupportedHIDL(feature)) {
IBase obj = mHIDLMap.get(feature);
switch (feature) {
case FEATURE_ADAPTIVE_BACKLIGHT:
vendor.lineage.livedisplay.V2_0.IAdaptiveBacklight adaptiveBacklight =
(vendor.lineage.livedisplay.V2_0.IAdaptiveBacklight) obj;
return adaptiveBacklight.setEnabled(enable);
case FEATURE_ANTI_FLICKER:
vendor.lineage.livedisplay.V2_1.IAntiFlicker antiFlicker =
(vendor.lineage.livedisplay.V2_1.IAntiFlicker) obj;
return antiFlicker.setEnabled(enable);
case FEATURE_AUTO_CONTRAST:
vendor.lineage.livedisplay.V2_0.IAutoContrast autoContrast =
(vendor.lineage.livedisplay.V2_0.IAutoContrast) obj;
return autoContrast.setEnabled(enable);
case FEATURE_COLOR_ENHANCEMENT:
vendor.lineage.livedisplay.V2_0.IColorEnhancement colorEnhancement =
(vendor.lineage.livedisplay.V2_0.IColorEnhancement) obj;
return colorEnhancement.setEnabled(enable);
case FEATURE_READING_ENHANCEMENT:
vendor.lineage.livedisplay.V2_0.IReadingEnhancement readingEnhancement =
(vendor.lineage.livedisplay.V2_0.IReadingEnhancement) obj;
return readingEnhancement.setEnabled(enable);
case FEATURE_SUNLIGHT_ENHANCEMENT:
vendor.lineage.livedisplay.V2_0.ISunlightEnhancement sunlightEnhancement =
(vendor.lineage.livedisplay.V2_0.ISunlightEnhancement) obj;
return sunlightEnhancement.setEnabled(enable);
}
} else if (checkService()) {
return sService.set(feature, enable);
}
@@ -598,17 +485,11 @@ public final class LineageHardwareManager {
private int[] getDisplayColorCalibrationArray() {
try {
if (isSupportedAIDL(FEATURE_DISPLAY_COLOR_CALIBRATION)) {
vendor.lineage.livedisplay.IDisplayColorCalibration displayColorCalibration =
vendor.lineage.livedisplay.IDisplayColorCalibration.Stub.asInterface(
IDisplayColorCalibration displayColorCalibration =
IDisplayColorCalibration.Stub.asInterface(
mAIDLMap.get(FEATURE_DISPLAY_COLOR_CALIBRATION));
return displayColorCalibration.getCalibration();
}
if (isSupportedHIDL(FEATURE_DISPLAY_COLOR_CALIBRATION)) {
vendor.lineage.livedisplay.V2_0.IDisplayColorCalibration displayColorCalibration =
(vendor.lineage.livedisplay.V2_0.IDisplayColorCalibration)
mHIDLMap.get(FEATURE_DISPLAY_COLOR_CALIBRATION);
return ArrayUtils.convertToIntArray(displayColorCalibration.getCalibration());
}
if (checkService()) {
return sService.getDisplayColorCalibration();
}
@@ -633,8 +514,8 @@ public final class LineageHardwareManager {
*/
public int getDisplayColorCalibrationMin() {
if (isSupportedAIDL(FEATURE_DISPLAY_COLOR_CALIBRATION)) {
vendor.lineage.livedisplay.IDisplayColorCalibration displayColorCalibration =
vendor.lineage.livedisplay.IDisplayColorCalibration.Stub.asInterface(
IDisplayColorCalibration displayColorCalibration =
IDisplayColorCalibration.Stub.asInterface(
mAIDLMap.get(FEATURE_DISPLAY_COLOR_CALIBRATION));
try {
return displayColorCalibration.getMinValue();
@@ -642,16 +523,6 @@ public final class LineageHardwareManager {
return 0;
}
}
if (isSupportedHIDL(FEATURE_DISPLAY_COLOR_CALIBRATION)) {
vendor.lineage.livedisplay.V2_0.IDisplayColorCalibration displayColorCalibration =
(vendor.lineage.livedisplay.V2_0.IDisplayColorCalibration)
mHIDLMap.get(FEATURE_DISPLAY_COLOR_CALIBRATION);
try {
return displayColorCalibration.getMinValue();
} catch (RemoteException e) {
return 0;
}
}
return getArrayValue(getDisplayColorCalibrationArray(), COLOR_CALIBRATION_MIN_INDEX, 0);
}
@@ -661,8 +532,8 @@ public final class LineageHardwareManager {
*/
public int getDisplayColorCalibrationMax() {
if (isSupportedAIDL(FEATURE_DISPLAY_COLOR_CALIBRATION)) {
vendor.lineage.livedisplay.IDisplayColorCalibration displayColorCalibration =
vendor.lineage.livedisplay.IDisplayColorCalibration.Stub.asInterface(
IDisplayColorCalibration displayColorCalibration =
IDisplayColorCalibration.Stub.asInterface(
mAIDLMap.get(FEATURE_DISPLAY_COLOR_CALIBRATION));
try {
return displayColorCalibration.getMaxValue();
@@ -670,16 +541,6 @@ public final class LineageHardwareManager {
return 0;
}
}
if (isSupportedHIDL(FEATURE_DISPLAY_COLOR_CALIBRATION)) {
vendor.lineage.livedisplay.V2_0.IDisplayColorCalibration displayColorCalibration =
(vendor.lineage.livedisplay.V2_0.IDisplayColorCalibration)
mHIDLMap.get(FEATURE_DISPLAY_COLOR_CALIBRATION);
try {
return displayColorCalibration.getMaxValue();
} catch (RemoteException e) {
return 0;
}
}
return getArrayValue(getDisplayColorCalibrationArray(), COLOR_CALIBRATION_MAX_INDEX, 0);
}
@@ -696,19 +557,12 @@ public final class LineageHardwareManager {
public boolean setDisplayColorCalibration(int[] rgb) {
try {
if (isSupportedAIDL(FEATURE_DISPLAY_COLOR_CALIBRATION)) {
vendor.lineage.livedisplay.IDisplayColorCalibration displayColorCalibration =
vendor.lineage.livedisplay.IDisplayColorCalibration.Stub.asInterface(
IDisplayColorCalibration displayColorCalibration =
IDisplayColorCalibration.Stub.asInterface(
mAIDLMap.get(FEATURE_DISPLAY_COLOR_CALIBRATION));
displayColorCalibration.setCalibration(rgb);
return true;
}
if (isSupportedHIDL(FEATURE_DISPLAY_COLOR_CALIBRATION)) {
vendor.lineage.livedisplay.V2_0.IDisplayColorCalibration displayColorCalibration =
(vendor.lineage.livedisplay.V2_0.IDisplayColorCalibration)
mHIDLMap.get(FEATURE_DISPLAY_COLOR_CALIBRATION);
return displayColorCalibration.setCalibration(
new ArrayList<Integer>(Arrays.asList(rgb[0], rgb[1], rgb[2])));
}
if (checkService()) {
return sService.setDisplayColorCalibration(rgb);
}
@@ -724,15 +578,9 @@ public final class LineageHardwareManager {
DisplayMode[] modes = null;
try {
if (isSupportedAIDL(FEATURE_DISPLAY_MODES)) {
vendor.lineage.livedisplay.IDisplayModes displayModes =
vendor.lineage.livedisplay.IDisplayModes.Stub.asInterface(
mAIDLMap.get(FEATURE_DISPLAY_MODES));
IDisplayModes displayModes =
IDisplayModes.Stub.asInterface(mAIDLMap.get(FEATURE_DISPLAY_MODES));
modes = AIDLHelper.fromAIDLModes(displayModes.getDisplayModes());
} else if (isSupportedHIDL(FEATURE_DISPLAY_MODES)) {
vendor.lineage.livedisplay.V2_0.IDisplayModes displayModes =
(vendor.lineage.livedisplay.V2_0.IDisplayModes)
mHIDLMap.get(FEATURE_DISPLAY_MODES);
modes = HIDLHelper.fromHIDLModes(displayModes.getDisplayModes());
}
} catch (RemoteException e) {
} finally {
@@ -757,15 +605,9 @@ public final class LineageHardwareManager {
DisplayMode mode = null;
try {
if (isSupportedAIDL(FEATURE_DISPLAY_MODES)) {
vendor.lineage.livedisplay.IDisplayModes displayModes =
vendor.lineage.livedisplay.IDisplayModes.Stub.asInterface(
mAIDLMap.get(FEATURE_DISPLAY_MODES));
IDisplayModes displayModes =
IDisplayModes.Stub.asInterface(mAIDLMap.get(FEATURE_DISPLAY_MODES));
mode = AIDLHelper.fromAIDLMode(displayModes.getCurrentDisplayMode());
} else if (isSupportedHIDL(FEATURE_DISPLAY_MODES)) {
vendor.lineage.livedisplay.V2_0.IDisplayModes displayModes =
(vendor.lineage.livedisplay.V2_0.IDisplayModes)
mHIDLMap.get(FEATURE_DISPLAY_MODES);
mode = HIDLHelper.fromHIDLMode(displayModes.getCurrentDisplayMode());
}
} catch (RemoteException e) {
} finally {
@@ -780,15 +622,9 @@ public final class LineageHardwareManager {
DisplayMode mode = null;
try {
if (isSupportedAIDL(FEATURE_DISPLAY_MODES)) {
vendor.lineage.livedisplay.IDisplayModes displayModes =
vendor.lineage.livedisplay.IDisplayModes.Stub.asInterface(
mAIDLMap.get(FEATURE_DISPLAY_MODES));
IDisplayModes displayModes =
IDisplayModes.Stub.asInterface(mAIDLMap.get(FEATURE_DISPLAY_MODES));
mode = AIDLHelper.fromAIDLMode(displayModes.getDefaultDisplayMode());
} else if (isSupportedHIDL(FEATURE_DISPLAY_MODES)) {
vendor.lineage.livedisplay.V2_0.IDisplayModes displayModes =
(vendor.lineage.livedisplay.V2_0.IDisplayModes)
mHIDLMap.get(FEATURE_DISPLAY_MODES);
mode = HIDLHelper.fromHIDLMode(displayModes.getDefaultDisplayMode());
}
} catch (RemoteException e) {
} finally {
@@ -802,18 +638,11 @@ public final class LineageHardwareManager {
public boolean setDisplayMode(DisplayMode mode, boolean makeDefault) {
try {
if (isSupportedAIDL(FEATURE_DISPLAY_MODES)) {
vendor.lineage.livedisplay.IDisplayModes displayModes =
vendor.lineage.livedisplay.IDisplayModes.Stub.asInterface(
mAIDLMap.get(FEATURE_DISPLAY_MODES));
IDisplayModes displayModes =
IDisplayModes.Stub.asInterface(mAIDLMap.get(FEATURE_DISPLAY_MODES));
displayModes.setDisplayMode(mode.id, makeDefault);
return true;
}
if (isSupportedHIDL(FEATURE_DISPLAY_MODES)) {
vendor.lineage.livedisplay.V2_0.IDisplayModes displayModes =
(vendor.lineage.livedisplay.V2_0.IDisplayModes)
mHIDLMap.get(FEATURE_DISPLAY_MODES);
return displayModes.setDisplayMode(mode.id, makeDefault);
}
} catch (RemoteException e) {
}
return false;
@@ -838,17 +667,10 @@ public final class LineageHardwareManager {
public Range<Integer> getColorBalanceRange() {
try {
if (isSupportedAIDL(FEATURE_COLOR_BALANCE)) {
vendor.lineage.livedisplay.IColorBalance colorBalance =
vendor.lineage.livedisplay.IColorBalance.Stub.asInterface(
mAIDLMap.get(FEATURE_COLOR_BALANCE));
IColorBalance colorBalance =
IColorBalance.Stub.asInterface(mAIDLMap.get(FEATURE_COLOR_BALANCE));
return AIDLHelper.fromAIDLRange(colorBalance.getColorBalanceRange());
}
if (isSupportedHIDL(FEATURE_COLOR_BALANCE)) {
vendor.lineage.livedisplay.V2_0.IColorBalance colorBalance =
(vendor.lineage.livedisplay.V2_0.IColorBalance)
mHIDLMap.get(FEATURE_COLOR_BALANCE);
return HIDLHelper.fromHIDLRange(colorBalance.getColorBalanceRange());
}
} catch (RemoteException e) {
}
return new Range<Integer>(0, 0);
@@ -860,15 +682,8 @@ public final class LineageHardwareManager {
public int getColorBalance() {
try {
if (isSupportedAIDL(FEATURE_COLOR_BALANCE)) {
vendor.lineage.livedisplay.IColorBalance colorBalance =
vendor.lineage.livedisplay.IColorBalance.Stub.asInterface(
mAIDLMap.get(FEATURE_COLOR_BALANCE));
return colorBalance.getColorBalance();
}
if (isSupportedHIDL(FEATURE_COLOR_BALANCE)) {
vendor.lineage.livedisplay.V2_0.IColorBalance colorBalance =
(vendor.lineage.livedisplay.V2_0.IColorBalance)
mHIDLMap.get(FEATURE_COLOR_BALANCE);
IColorBalance colorBalance =
IColorBalance.Stub.asInterface(mAIDLMap.get(FEATURE_COLOR_BALANCE));
return colorBalance.getColorBalance();
}
} catch (RemoteException e) {
@@ -886,18 +701,11 @@ public final class LineageHardwareManager {
public boolean setColorBalance(int value) {
try {
if (isSupportedAIDL(FEATURE_COLOR_BALANCE)) {
vendor.lineage.livedisplay.IColorBalance colorBalance =
vendor.lineage.livedisplay.IColorBalance.Stub.asInterface(
mAIDLMap.get(FEATURE_COLOR_BALANCE));
IColorBalance colorBalance =
IColorBalance.Stub.asInterface(mAIDLMap.get(FEATURE_COLOR_BALANCE));
colorBalance.setColorBalance(value);
return true;
}
if (isSupportedHIDL(FEATURE_COLOR_BALANCE)) {
vendor.lineage.livedisplay.V2_0.IColorBalance colorBalance =
(vendor.lineage.livedisplay.V2_0.IColorBalance)
mHIDLMap.get(FEATURE_COLOR_BALANCE);
return colorBalance.setColorBalance(value);
}
} catch (RemoteException e) {
}
return false;
@@ -911,17 +719,10 @@ public final class LineageHardwareManager {
public HSIC getPictureAdjustment() {
try {
if (isSupportedAIDL(FEATURE_PICTURE_ADJUSTMENT)) {
vendor.lineage.livedisplay.IPictureAdjustment pictureAdjustment =
vendor.lineage.livedisplay.IPictureAdjustment.Stub.asInterface(
mAIDLMap.get(FEATURE_PICTURE_ADJUSTMENT));
IPictureAdjustment pictureAdjustment = IPictureAdjustment.Stub.asInterface(
mAIDLMap.get(FEATURE_PICTURE_ADJUSTMENT));
return AIDLHelper.fromAIDLHSIC(pictureAdjustment.getPictureAdjustment());
}
if (isSupportedHIDL(FEATURE_PICTURE_ADJUSTMENT)) {
vendor.lineage.livedisplay.V2_0.IPictureAdjustment pictureAdjustment =
(vendor.lineage.livedisplay.V2_0.IPictureAdjustment)
mHIDLMap.get(FEATURE_PICTURE_ADJUSTMENT);
return HIDLHelper.fromHIDLHSIC(pictureAdjustment.getPictureAdjustment());
}
} catch (RemoteException e) {
}
return null;
@@ -935,17 +736,10 @@ public final class LineageHardwareManager {
public HSIC getDefaultPictureAdjustment() {
try {
if (isSupportedAIDL(FEATURE_PICTURE_ADJUSTMENT)) {
vendor.lineage.livedisplay.IPictureAdjustment pictureAdjustment =
vendor.lineage.livedisplay.IPictureAdjustment.Stub.asInterface(
mAIDLMap.get(FEATURE_PICTURE_ADJUSTMENT));
IPictureAdjustment pictureAdjustment = IPictureAdjustment.Stub.asInterface(
mAIDLMap.get(FEATURE_PICTURE_ADJUSTMENT));
return AIDLHelper.fromAIDLHSIC(pictureAdjustment.getDefaultPictureAdjustment());
}
if (isSupportedHIDL(FEATURE_PICTURE_ADJUSTMENT)) {
vendor.lineage.livedisplay.V2_0.IPictureAdjustment pictureAdjustment =
(vendor.lineage.livedisplay.V2_0.IPictureAdjustment)
mHIDLMap.get(FEATURE_PICTURE_ADJUSTMENT);
return HIDLHelper.fromHIDLHSIC(pictureAdjustment.getDefaultPictureAdjustment());
}
} catch (RemoteException e) {
}
return null;
@@ -960,18 +754,11 @@ public final class LineageHardwareManager {
public boolean setPictureAdjustment(final HSIC hsic) {
try {
if (isSupportedAIDL(FEATURE_PICTURE_ADJUSTMENT)) {
vendor.lineage.livedisplay.IPictureAdjustment pictureAdjustment =
vendor.lineage.livedisplay.IPictureAdjustment.Stub.asInterface(
mAIDLMap.get(FEATURE_PICTURE_ADJUSTMENT));
IPictureAdjustment pictureAdjustment = IPictureAdjustment.Stub.asInterface(
mAIDLMap.get(FEATURE_PICTURE_ADJUSTMENT));
pictureAdjustment.setPictureAdjustment(AIDLHelper.toAIDLHSIC(hsic));
return true;
}
if (isSupportedHIDL(FEATURE_PICTURE_ADJUSTMENT)) {
vendor.lineage.livedisplay.V2_0.IPictureAdjustment pictureAdjustment =
(vendor.lineage.livedisplay.V2_0.IPictureAdjustment)
mHIDLMap.get(FEATURE_PICTURE_ADJUSTMENT);
return pictureAdjustment.setPictureAdjustment(HIDLHelper.toHIDLHSIC(hsic));
}
} catch (RemoteException e) {
}
return false;
@@ -985,9 +772,8 @@ public final class LineageHardwareManager {
public List<Range<Float>> getPictureAdjustmentRanges() {
try {
if (isSupportedAIDL(FEATURE_PICTURE_ADJUSTMENT)) {
vendor.lineage.livedisplay.IPictureAdjustment pictureAdjustment =
vendor.lineage.livedisplay.IPictureAdjustment.Stub.asInterface(
mAIDLMap.get(FEATURE_PICTURE_ADJUSTMENT));
IPictureAdjustment pictureAdjustment = IPictureAdjustment.Stub.asInterface(
mAIDLMap.get(FEATURE_PICTURE_ADJUSTMENT));
return Arrays.asList(
AIDLHelper.fromAIDLRange(pictureAdjustment.getHueRange()),
AIDLHelper.fromAIDLRange(pictureAdjustment.getSaturationRange()),
@@ -995,17 +781,6 @@ public final class LineageHardwareManager {
AIDLHelper.fromAIDLRange(pictureAdjustment.getContrastRange()),
AIDLHelper.fromAIDLRange(pictureAdjustment.getSaturationThresholdRange()));
}
if (isSupportedHIDL(FEATURE_PICTURE_ADJUSTMENT)) {
vendor.lineage.livedisplay.V2_0.IPictureAdjustment pictureAdjustment =
(vendor.lineage.livedisplay.V2_0.IPictureAdjustment)
mHIDLMap.get(FEATURE_PICTURE_ADJUSTMENT);
return Arrays.asList(
HIDLHelper.fromHIDLRange(pictureAdjustment.getHueRange()),
HIDLHelper.fromHIDLRange(pictureAdjustment.getSaturationRange()),
HIDLHelper.fromHIDLRange(pictureAdjustment.getIntensityRange()),
HIDLHelper.fromHIDLRange(pictureAdjustment.getContrastRange()),
HIDLHelper.fromHIDLRange(pictureAdjustment.getSaturationThresholdRange()));
}
} catch (RemoteException e) {
}
return null;