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

am 56ae0447: am 686a41ef: Merge "Add API level for MR1." into lmp-mr1-dev

Browse Source 
* commit '56ae044791aa9a800292eb0f6c3852ede91f17c2':
  Add API level for MR1.
This commit is contained in:
Dianne Hackborn
2014-10-17 17:19:55 +00:00
committed by Android Git Automerger
parent c64630d013 56ae044791
commit aa02bce2f4
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

@@ -21401,6 +21401,7 @@ package android.os {
field public static final int KITKAT_WATCH = 20; // 0x14 field public static final int KITKAT_WATCH = 20; // 0x14
field public static final int L = 21; // 0x15 field public static final int L = 21; // 0x15
field public static final int LOLLIPOP = 21; // 0x15 field public static final int LOLLIPOP = 21; // 0x15
field public static final int LOLLIPOP_MR1 = 22; // 0x16
} }
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

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

@@ -570,6 +570,11 @@ public class Build {
* </ul> * </ul>
*/ */
public static final int LOLLIPOP = 21; public static final int LOLLIPOP = 21;
/**
* Lollipop with an extra sugar coating on the outside!
*/
public static final int LOLLIPOP_MR1 = 22;
} }
/** The type of build, like "user" or "eng". */ /** The type of build, like "user" or "eng". */