Make color matrix parsing more robust. (8766c398) · Commits · e / os / android_frameworks_base

services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java

+14 −4

Original line number	Original line	Diff line number	Diff line
	@@ -110,18 +110,28 @@ class DisplayAdjustmentUtils {
	String matrix = Settings.Secure.getStringForUser(cr,		String matrix = Settings.Secure.getStringForUser(cr,
	Settings.Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX, userId);		Settings.Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX, userId);
	if (matrix != null) {		if (matrix != null) {
	colorMatrix = multiply(colorMatrix, getMatrix(matrix));		final float[] userMatrix = get4x4Matrix(matrix);
			if (userMatrix != null) {
			colorMatrix = multiply(colorMatrix, userMatrix);
			}
	}		}

	setColorTransform(colorMatrix);		setColorTransform(colorMatrix);
	}		}

	private static float[] getMatrix(String matrix) {		private static float[] get4x4Matrix(String matrix) {
	String[] strValues = matrix.split(",");		String[] strValues = matrix.split(",");
			if (strValues.length != 16) {
			return null;
			}
	float[] values = new float[strValues.length];		float[] values = new float[strValues.length];
			try {
	for (int i = 0; i < values.length; i++) {		for (int i = 0; i < values.length; i++) {
	values[i] = Float.parseFloat(strValues[i]);		values[i] = Float.parseFloat(strValues[i]);
	}		}
			} catch (java.lang.NumberFormatException ex) {
			return null;
			}
	return values;		return values;
	}		}