diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-10-29 02:02:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-29 02:02:08 -0700 |
| commit | f267b947657a3c057d15650a39b98e7b2129bc70 (patch) | |
| tree | 67939c2decb55d5515001cbd6cef13a056438733 | |
| parent | 8a6219660d3d0b88423bdb9239852ca95e24f57d (diff) | |
| parent | 9a27909e754b8b2623bbc82a931c2930c033cbb1 (diff) | |
| download | frameworks_base-f267b947657a3c057d15650a39b98e7b2129bc70.zip frameworks_base-f267b947657a3c057d15650a39b98e7b2129bc70.tar.gz frameworks_base-f267b947657a3c057d15650a39b98e7b2129bc70.tar.bz2 | |
am 9a27909e: am 40946aa2: am 1f668fff: Merge change Idb13ed9a into eclair
Merge commit '9a27909e754b8b2623bbc82a931c2930c033cbb1'
* commit '9a27909e754b8b2623bbc82a931c2930c033cbb1':
Add SDK version for MR1.
| -rw-r--r-- | api/current.xml | 11 | ||||
| -rw-r--r-- | core/java/android/os/Build.java | 13 |
2 files changed, 22 insertions, 2 deletions
diff --git a/api/current.xml b/api/current.xml index 8a6cfa1..4412df5 100644 --- a/api/current.xml +++ b/api/current.xml @@ -99410,6 +99410,17 @@ visibility="public" > </field> +<field name="ECLAIR_MR1" + type="int" + transient="false" + volatile="false" + value="6" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> <class name="Bundle" extends="java.lang.Object" diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 0f8bc08..d4aaba3 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -103,16 +103,19 @@ public class Build { * October 2008: The original, first, version of Android. Yay! */ public static final int BASE = 1; + /** * February 2009: First Android update, officially called 1.1. */ public static final int BASE_1_1 = 2; + /** * May 2009: Android 1.5. */ public static final int CUPCAKE = 3; + /** - * Current work on "Donut" development branch. + * September 2009: Android 1.6. * * <p>Applications targeting this or a later release will get these * new changes in behavior:</p> @@ -133,8 +136,9 @@ public class Build { * </ul> */ public static final int DONUT = 4; + /** - * Current work on "Eclair" development branch. + * November 2009: Android 2.0 * * <p>Applications targeting this or a later release will get these * new changes in behavior:</p> @@ -152,6 +156,11 @@ public class Build { * </ul> */ public static final int ECLAIR = 5; + + /** + * Current work on Eclair MR1. + */ + public static final int ECLAIR_MR1 = 6; } /** The type of build, like "user" or "eng". */ |