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

Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev

Browse Source
This commit is contained in:
Jeff Brown
2014-04-16 20:49:14 +00:00
committed by Android (Google) Code Review
parent 2fd3cb9544 1c3f332c3f
commit fa72a9eaae
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

@@ -17667,6 +17667,7 @@ package android.os {
field public static final int JELLY_BEAN_MR1 = 17; // 0x11
field public static final int JELLY_BEAN_MR2 = 18; // 0x12
field public static final int KITKAT = 19; // 0x13
field public static final int KITKAT_WATCH = 10000; // 0x2710
}
public final class Bundle implements java.lang.Cloneable android.os.Parcelable {

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

@@ -467,6 +467,11 @@ public class Build {
* </ul>
*/
public static final int KITKAT = 19;
/**
* Android 4.5: KitKat for watches, snacks on the run.
*/
public static final int KITKAT_WATCH = CUR_DEVELOPMENT; // STOPSHIP: update API level
}
/** The type of build, like "user" or "eng". */