ADHOC
/
replicant-vendor_cmsdk
3
0
Fork 0
Code Issues Pull Requests Releases Activity

livedisplay: Fix three bugs 

* Fix issue with color adjustments not being applied at bootup.
 * Fix issue where hardware was always updated twice.
 * Check the display state inside the color animator- this was
   occasionally racing and triggering kernel bugs on some devices.

Change-Id: Ieb9845e6b0f1c7ca979cbfa35c0b9b688ef1a8cf
This commit is contained in:
Steve Kondik 2016-04-24 01:41:19 -07:00
parent bf5261c360
commit e41c2924cb
2 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
cm/lib/main/java/org/cyanogenmod/platform/internal/display/DisplayHardwareController.java
View File

@ -25,6 +25,7 @@ import android.os.IBinder;
import android.os.Parcel; import android.os.Parcel;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.util.MathUtils;
import android.util.Slog; import android.util.Slog;
import android.view.animation.LinearInterpolator; import android.view.animation.LinearInterpolator;
@ -57,7 +58,6 @@ public class DisplayHardwareController extends LiveDisplayFeature {
private final float[] mColorAdjustment = getDefaultAdjustment(); private final float[] mColorAdjustment = getDefaultAdjustment();
private ValueAnimator mAnimator; private ValueAnimator mAnimator;
private boolean mDirty = false;
private final int mMaxColor; private final int mMaxColor;
@ -92,7 +92,12 @@ public class DisplayHardwareController extends LiveDisplayFeature {
mUseColorAdjustment = mHardware mUseColorAdjustment = mHardware
.isSupported(CMHardwareManager.FEATURE_DISPLAY_COLOR_CALIBRATION); .isSupported(CMHardwareManager.FEATURE_DISPLAY_COLOR_CALIBRATION);
mMaxColor = mHardware.getDisplayColorCalibrationMax(); if (mUseColorAdjustment) {
mMaxColor = mHardware.getDisplayColorCalibrationMax();
copyColors(getColorAdjustment(), mColorAdjustment);
} else {
mMaxColor = 0;
}
} }
@Override @Override
@ -147,9 +152,8 @@ public class DisplayHardwareController extends LiveDisplayFeature {
if (uri == null || uri.equals(DISPLAY_COLOR_ENHANCE)) { if (uri == null || uri.equals(DISPLAY_COLOR_ENHANCE)) {
updateColorEnhancement(); updateColorEnhancement();
} }
if (uri == null || uri.equals(DISPLAY_COLOR_ADJUSTMENT) && if (uri == null || uri.equals(DISPLAY_COLOR_ADJUSTMENT)) {
parseColorAdjustment(getString( copyColors(getColorAdjustment(), mColorAdjustment);
CMSettings.System.DISPLAY_COLOR_ADJUSTMENT), mColorAdjustment)) {
updateColorAdjustment(); updateColorAdjustment();
} }
} }
@ -172,10 +176,8 @@ public class DisplayHardwareController extends LiveDisplayFeature {
if (mUseColorAdjustment) { if (mUseColorAdjustment) {
if (mAnimator != null && mAnimator.isRunning() && !isScreenOn()) { if (mAnimator != null && mAnimator.isRunning() && !isScreenOn()) {
mAnimator.cancel(); mAnimator.cancel();
mDirty = true; } else if (isScreenOn()) {
} else if (mDirty && isScreenOn()) {
updateColorAdjustment(); updateColorAdjustment();
mDirty = false;
} }
} }
} }
@ -239,10 +241,10 @@ public class DisplayHardwareController extends LiveDisplayFeature {
final float[] rgb = getDefaultAdjustment(); final float[] rgb = getDefaultAdjustment();
if (!isLowPowerMode()) { if (!isLowPowerMode()) {
System.arraycopy(mAdditionalAdjustment, 0, rgb, 0, 3); copyColors(mColorAdjustment, rgb);
rgb[0] *= mColorAdjustment[0]; rgb[0] *= mAdditionalAdjustment[0];
rgb[1] *= mColorAdjustment[1]; rgb[1] *= mAdditionalAdjustment[1];
rgb[2] *= mColorAdjustment[2]; rgb[2] *= mAdditionalAdjustment[2];
} }
if (DEBUG) { if (DEBUG) {
@ -296,12 +298,15 @@ public class DisplayHardwareController extends LiveDisplayFeature {
@Override @Override
public void onAnimationUpdate(final ValueAnimator animation) { public void onAnimationUpdate(final ValueAnimator animation) {
synchronized (DisplayHardwareController.this) { synchronized (DisplayHardwareController.this) {
float[] value = (float[])animation.getAnimatedValue(); if (isScreenOn()) {
mHardware.setDisplayColorCalibration(new int[] { float[] value = (float[]) animation.getAnimatedValue();
(int)(value[0] * mMaxColor), mHardware.setDisplayColorCalibration(new int[] {
(int)(value[1] * mMaxColor), (int) (value[0] * mMaxColor),
(int)(value[2] * mMaxColor) }); (int) (value[1] * mMaxColor),
screenRefresh(); (int) (value[2] * mMaxColor)
});
screenRefresh();
}
} }
} }
}); });
@ -333,20 +338,14 @@ public class DisplayHardwareController extends LiveDisplayFeature {
* @return true if valid * @return true if valid
*/ */
private boolean validateColors(float[] colors) { private boolean validateColors(float[] colors) {
if (colors != null && colors.length == 3 && if (colors == null || colors.length != 3) {
!(colors[0] <= 0.0f && colors[1] <= 0.0f && colors[2] <= 0.0f)) { return false;
for (int i = 0; i < 3; i++) {
if (colors[i] > 1.0f) {
colors[i] = 1.0f;
}
}
return true;
} }
colors[0] = 1.0f; for (int i = 0; i < 3; i++) {
colors[1] = 1.0f; colors[i] = MathUtils.constrain(colors[i], 0.0f, 1.0f);
colors[2] = 1.0f; }
return false; return true;
} }
/** /**
@ -388,7 +387,7 @@ public class DisplayHardwareController extends LiveDisplayFeature {
// Sanity check this so we don't mangle the display // Sanity check this so we don't mangle the display
if (validateColors(adj)) { if (validateColors(adj)) {
System.arraycopy(adj, 0, mAdditionalAdjustment, 0, 3); copyColors(adj, mAdditionalAdjustment);
updateColorAdjustment(); updateColorAdjustment();
return true; return true;
} }
@ -482,4 +481,12 @@ public class DisplayHardwareController extends LiveDisplayFeature {
private static float[] getDefaultAdjustment() { private static float[] getDefaultAdjustment() {
return new float[] { 1.0f, 1.0f, 1.0f }; return new float[] { 1.0f, 1.0f, 1.0f };
} }
private void copyColors(float[] src, float[] dst) {
if (src != null && dst != null && src.length == 3 && dst.length == 3) {
dst[0] = src[0];
dst[1] = src[1];
dst[2] = src[2];
}
}
} }

2
cm/lib/main/java/org/cyanogenmod/platform/internal/display/LiveDisplayFeature.java
View File

@ -74,7 +74,7 @@ public abstract class LiveDisplayFeature {
if ((flags & MODE_CHANGED) != 0) { if ((flags & MODE_CHANGED) != 0) {
onUpdate(); onUpdate();
} }
if ((flags & ALL_CHANGED) != 0) { if (flags == ALL_CHANGED) {
onSettingsChanged(null); onSettingsChanged(null);
} }
} }