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

livedisplay: Float-to-string conversions considered harmful 

* Force US locale when doing internal flattening of HSIC objects
   into strings. This would crash in the validator if the user's
   local uses commands instead of dots to format floats.

Change-Id: I08f44238a486308a483205b97632114d2f7a77f1
This commit is contained in:
Steve Kondik 2016-08-10 02:06:40 -07:00
parent c0dd46d30f
commit db640a9648
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sdk/src/java/cyanogenmod/hardware/HSIC.java
View File

@ -18,9 +18,10 @@ package cyanogenmod.hardware;
import android.graphics.Color;
import android.os.Parcel;
import android.os.Parcelable;
import android.text.TextUtils;
import java.util.Locale;
public class HSIC implements Parcelable {
private final float mHue;
@ -59,7 +60,7 @@ public class HSIC implements Parcelable {
}
public String flatten() {
return String.format("%f|%f|%f|%f|%f", mHue, mSaturation,
return String.format(Locale.US, "%f|%f|%f|%f|%f", mHue, mSaturation,
mIntensity, mContrast, mSaturationThreshold);
}
@ -68,9 +69,9 @@ public class HSIC implements Parcelable {
if (unflat.length != 4 && unflat.length != 5) {
throw new NumberFormatException("Failed to unflatten HSIC values: " + flat);
}
return new HSIC(Float.valueOf(unflat[0]), Float.valueOf(unflat[1]),
Float.valueOf(unflat[2]), Float.valueOf(unflat[3]),
unflat.length == 5 ? Float.valueOf(unflat[4]) : 0.0f);
return new HSIC(Float.parseFloat(unflat[0]), Float.parseFloat(unflat[1]),
Float.parseFloat(unflat[2]), Float.parseFloat(unflat[3]),
unflat.length == 5 ? Float.parseFloat(unflat[4]) : 0.0f);
}
public int[] toRGB() {
@ -93,7 +94,7 @@ public class HSIC implements Parcelable {
@Override
public String toString() {
return String.format("HSIC={ hue=%f saturation=%f intensity=%f " +
return String.format(Locale.US, "HSIC={ hue=%f saturation=%f intensity=%f " +
"contrast=%f saturationThreshold=%f }",
mHue, mSaturation, mIntensity, mContrast, mSaturationThreshold);
}