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

Merge "Add K api version."

Browse Source
This commit is contained in:
Nick Kralevich
2013-01-09 16:11:05 -08:00
committed by Android (Google) Code Review
parent 6b0fb36870 a985c3bb14
commit ee49a3a007
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -15743,6 +15743,7 @@ package android.os {
field public static final int ICE_CREAM_SANDWICH_MR1 = 15; // 0xf field public static final int ICE_CREAM_SANDWICH_MR1 = 15; // 0xf
field public static final int JELLY_BEAN = 16; // 0x10 field public static final int JELLY_BEAN = 16; // 0x10
field public static final int JELLY_BEAN_MR1 = 17; // 0x11 field public static final int JELLY_BEAN_MR1 = 17; // 0x11
field public static final int K = 10000; // 0x2710
} }
public final class Bundle implements java.lang.Cloneable android.os.Parcelable { public final class Bundle implements java.lang.Cloneable android.os.Parcelable {

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

@@ -431,6 +431,11 @@ public class Build {
* </ul> * </ul>
*/ */
public static final int JELLY_BEAN_MR1 = 17; public static final int JELLY_BEAN_MR1 = 17;
/**
* Android X.X: "K". Just "K"
*/
public static final int K = CUR_DEVELOPMENT;
} }
/** The type of build, like "user" or "eng". */ /** The type of build, like "user" or "eng". */