Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebe28b02 authored by Orion Hodson's avatar Orion Hodson
Browse files

Prefer valueOf() to boxed primitive constructors 

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
parent 51766ce0

core/java/com/android/internal/util/TypedProperties.java

+25 −25
Original line number Diff line number Diff line
@@ -268,22 +268,22 @@ public class TypedProperties extends HashMap<String, Object> { 
                    if (value < Byte.MIN_VALUE || value > Byte.MAX_VALUE) {

                        throw new ParseException(st, "8-bit integer constant");

                    }

                return new Byte((byte)value);

                    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 new Short((short)value);

                    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 new Integer((int)value);

                    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 new Long(value);

                    return Long.valueOf(value);

                default:

                    throw new IllegalStateException(

                            "Internal error; unexpected integer type width " + width);
@@ -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".