summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-10-27 15:47:57 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-10-27 15:47:57 -0400
commit1f668fff8ad2b8d79d42da5d9667d308fa0b9441 (patch)
tree5b0e8076c7d6c355f15a7e38ed9441a236668226 /core
parent678cdbe55e0de71436f8aad5f139eafc2ab6f937 (diff)
parent0fa35918af608b56fb3f6aa98341624e22447f92 (diff)
downloadframeworks_base-1f668fff8ad2b8d79d42da5d9667d308fa0b9441.zip
frameworks_base-1f668fff8ad2b8d79d42da5d9667d308fa0b9441.tar.gz
frameworks_base-1f668fff8ad2b8d79d42da5d9667d308fa0b9441.tar.bz2
Merge change Idb13ed9a into eclair
* changes: Add SDK version for MR1.
Diffstat (limited to 'core')
-rw-r--r--core/java/android/os/Build.java13
1 files changed, 11 insertions, 2 deletions
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". */