Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefer valueOf() to boxed primitive constructors

Browse Source 
Constructors for boxed primitives (Byte, Short, Integer, etc) have
long been deprecated. The preferred pattern is to use valueOf(). d8
fails to convert these instances in TypedProperties, most likely due
to the method complexity.

Bug: N/A
Test: Treehugger
Change-Id: Ib58ecc853e2bd1e5d53e9ec256ef0467aa051d9f
This commit is contained in:
Orion Hodson
2022-09-14 09:46:56 +01:00
parent 51766ce04f
commit ebe28b0254
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
core/java/com/android/internal/util/TypedProperties.java
View File

@@ -264,29 +264,29 @@ public class TypedProperties extends HashMap<String, Object> {
// Ensure that the type can hold this value, and return.
int width = (type >> 8) & 0xff;
switch (width) {
case 1:
if (value < Byte.MIN_VALUE || value > Byte.MAX_VALUE) {
throw new ParseException(st, "8-bit integer constant");
}
return new Byte((byte)value);
case 2:
if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) {
throw new ParseException(st, "16-bit integer constant");
}
return new Short((short)value);
case 4:
if (value < Integer.MIN_VALUE || value > Integer.MAX_VALUE) {
throw new ParseException(st, "32-bit integer constant");
}
return new Integer((int)value);
case 8:
if (value < Long.MIN_VALUE || value > Long.MAX_VALUE) {
throw new ParseException(st, "64-bit integer constant");
}
return new Long(value);
default:
throw new IllegalStateException(
"Internal error; unexpected integer type width " + width);
case 1:
if (value < Byte.MIN_VALUE || value > Byte.MAX_VALUE) {
throw new ParseException(st, "8-bit integer constant");
}
return Byte.valueOf((byte) value);
case 2:
if (value < Short.MIN_VALUE || value > Short.MAX_VALUE) {
throw new ParseException(st, "16-bit integer constant");
}
return Short.valueOf((short) value);
case 4:
if (value < Integer.MIN_VALUE || value > Integer.MAX_VALUE) {
throw new ParseException(st, "32-bit integer constant");
}
return Integer.valueOf((int) value);
case 8:
if (value < Long.MIN_VALUE || value > Long.MAX_VALUE) {
throw new ParseException(st, "64-bit integer constant");
}
return Long.valueOf(value);
default:
throw new IllegalStateException(
"Internal error; unexpected integer type width " + width);
}
} else if ((type & 0xff) == 'F') {
if (token != StreamTokenizer.TT_WORD) {
@@ -317,10 +317,10 @@ public class TypedProperties extends HashMap<String, Object> {
throw new ParseException(st, "32-bit float constant");
}
}
return new Float((float)value);
return Float.valueOf((float) value);
} else {
// This property is a double; no need to truncate.
return new Double(value);
return Double.valueOf(value);
}
} else if (type == TYPE_STRING) {
// Expect a quoted string or the word "null".