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

Commit bb33d6fd authored by Doug Zongker's avatar Doug Zongker Committed by Android Git Automerger
Browse files

am 997dc32b: Merge "add an api for getting a device serial number" into gingerbread 

Merge commit '997dc32b' into gingerbread-plus-aosp

* commit '997dc32b':
  add an api for getting a device serial number
parents 4a054c1a 997dc32b

api/current.xml

+10 −0
Original line number Diff line number Diff line
@@ -121342,6 +121342,16 @@ 
 visibility="public"

>

</field>

<field name="SERIAL"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="TAGS"

 type="java.lang.String"

 transient="false"

core/java/android/os/Build.java

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ public class Build { 
    /** The name of the hardware (from the kernel command line or /proc). */

    public static final String HARDWARE = getString("ro.hardware");



    /** A hardware serial number, if available.  Alphanumeric only, case-insensitive. */ 

    public static final String SERIAL = getString("ro.serialno");

  

    /** Various version strings. */

    public static class VERSION {

        /**