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

Commit 1f668fff authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change Idb13ed9a into eclair 

* changes:
  Add SDK version for MR1.
parents 678cdbe5 0fa35918

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -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"

core/java/android/os/Build.java

+11 −2
Original line number Diff line number Diff line
@@ -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". */