From 39638c00c66e0fc83edec734d8f8d9039bedf73c Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Mon, 18 Apr 2016 15:04:12 -0700 Subject: cmhw: Fix DisplayColorCalibration GPU-mode issues * Make the fallback more robust * Fix method to return current values Change-Id: I13d31ed3994684ebaee9394d740c1c55aaf800ba --- src/org/cyanogenmod/hardware/DisplayColorCalibration.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/org/cyanogenmod/hardware/DisplayColorCalibration.java b/src/org/cyanogenmod/hardware/DisplayColorCalibration.java index f405281..04b0c57 100644 --- a/src/org/cyanogenmod/hardware/DisplayColorCalibration.java +++ b/src/org/cyanogenmod/hardware/DisplayColorCalibration.java @@ -43,7 +43,8 @@ public class DisplayColorCalibration { static { // We can also support GPU transform using RenderEngine. This is not // preferred though, as it has a high power cost. - sUseGPUMode = !(new File(COLOR_FILE).exists()) || + final File sysfs = new File(COLOR_FILE); + sUseGPUMode = (!sysfs.exists() || !sysfs.canWrite()) || SystemProperties.getBoolean("debug.livedisplay.force_gpu", false); } @@ -69,8 +70,8 @@ public class DisplayColorCalibration { return FileUtils.readOneLine(COLOR_FILE); } - return String.format("%d %d %d", sCurColors[0] * MAX, - sCurColors[1] * MAX, sCurColors[2] * MAX); + return String.format("%d %d %d", sCurColors[0], + sCurColors[1], sCurColors[2]); } public static boolean setColors(String colors) { -- cgit v1.2.3