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

Commit 98eaf2eb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add VERSION_CODES.P"

parents 7a35f63f 7bd7a623

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30679,6 +30679,7 @@ package android.os { 
    field public static final int N_MR1 = 25; // 0x19

    field public static final int O = 26; // 0x1a

    field public static final int O_MR1 = 27; // 0x1b

    field public static final int P = 10000; // 0x2710

  }















  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

























api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -33396,6 +33396,7 @@ package android.os {













    field public static final int N_MR1 = 25; // 0x19















    field public static final int O = 26; // 0x1a















    field public static final int O_MR1 = 27; // 0x1b













    field public static final int P = 10000; // 0x2710















  }





























  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

























api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -30823,6 +30823,7 @@ package android.os {













    field public static final int N_MR1 = 25; // 0x19















    field public static final int O = 26; // 0x1a















    field public static final int O_MR1 = 27; // 0x1b













    field public static final int P = 10000; // 0x2710















  }





























  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

























core/java/android/os/Build.java



+5
−0




























Original line number
Diff line number
Diff line








@@ -774,6 +774,11 @@ public class Build {













         * O MR1.















         */















        public static final int O_MR1 = 27;



























        /**













         * P.













         */













        public static final int P = CUR_DEVELOPMENT; // STOPSHIP Replace with the real version.















    }































    /** The type of build, like "user" or "eng". */

































tools/aapt/SdkConstants.h



+1
−0




























Original line number
Diff line number
Diff line








@@ -43,6 +43,7 @@ enum {













    SDK_NOUGAT_MR1 = 25,















    SDK_O = 26,















    SDK_O_MR1 = 27,













    SDK_P = 10000, // STOPSHIP Replace with the real version.















};































#endif // H_AAPT_SDK_CONSTANTS