Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ICS is API 14."

Browse Source
This commit is contained in:
Dianne Hackborn
2011-09-14 16:04:15 -07:00
committed by Android (Google) Code Review
parent 5eb41b01a6 0784cfb4b7
commit 67eb4320d2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -14386,7 +14386,7 @@ package android.os {
field public static final int HONEYCOMB = 11; // 0xb field public static final int HONEYCOMB = 11; // 0xb
field public static final int HONEYCOMB_MR1 = 12; // 0xc field public static final int HONEYCOMB_MR1 = 12; // 0xc
field public static final int HONEYCOMB_MR2 = 13; // 0xd field public static final int HONEYCOMB_MR2 = 13; // 0xd
field public static final int ICE_CREAM_SANDWICH = 10000; // 0x2710 field public static final int ICE_CREAM_SANDWICH = 14; // 0xe
} }
public final class Bundle implements java.lang.Cloneable android.os.Parcelable { public final class Bundle implements java.lang.Cloneable android.os.Parcelable {

4
core/java/android/os/Build.java
View File

@@ -277,7 +277,7 @@ public class Build {
public static final int HONEYCOMB_MR2 = 13; public static final int HONEYCOMB_MR2 = 13;
/** /**
* Current version under development. * Android 4.0.
* *
* <p>Applications targeting this or a later release will get these * <p>Applications targeting this or a later release will get these
* new changes in behavior:</p> * new changes in behavior:</p>
@@ -298,7 +298,7 @@ public class Build {
* {@link android.R.style#Theme_DeviceDefault} family. * {@link android.R.style#Theme_DeviceDefault} family.
* </ul> * </ul>
*/ */
public static final int ICE_CREAM_SANDWICH = CUR_DEVELOPMENT; public static final int ICE_CREAM_SANDWICH = 14;
} }
/** The type of build, like "user" or "eng". */ /** The type of build, like "user" or "eng". */