diff options
| author | 2010-08-16 13:20:05 -0700 | |
|---|---|---|
| committer | 2010-08-16 13:20:05 -0700 | |
| commit | bb33d6fd987727c24372d7b7109ec5d1db82efe2 (patch) | |
| tree | c0d5ef72ed1833aa5fcb158c280ae76d4855f180 | |
| parent | 4a054c1a5d7ee2db6c738ede002a35145b226588 (diff) | |
| parent | 997dc32b6bef1c9cc8ac6d4d598698507b2c4934 (diff) | |
am 997dc32b: Merge "add an api for getting a device serial number" into gingerbread
Merge commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934' into gingerbread-plus-aosp
* commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934':
add an api for getting a device serial number
| -rw-r--r-- | api/current.xml | 10 | ||||
| -rw-r--r-- | core/java/android/os/Build.java | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml index 7b86ecf3defe..fe52516bc9f4 100644 --- a/api/current.xml +++ b/api/current.xml @@ -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" diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index fdd3573b5e26..8925bd05cd83 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -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 { /** |