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

Merge "Prefer valueOf() to boxed primitive constructors" am: 773627cfd3

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2216444

Change-Id: I71f316027f164dd434602495ba318cd7a4fa8148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Orion Hodson
2022-09-20 08:08:55 +00:00
committed by Automerger Merge Worker
parent 1fb227f17f 773627cfd3
commit 2488ef52b4
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".