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

Commit 40a8e997 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by Android (Google) Code Review
Browse files

Merge "Revert "RESTRICT AUTOMERGE Android Q is API 29"" into qt-dev

parents f9bf1762 60c71cee

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -34158,7 +34158,7 @@ package android.os { 
    field public static final int O = 26; // 0x1a

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

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

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

    field public static final int P = 28; // 0x1c

    field public static final int P = 28; // 0x1c

    field public static final int Q = 29; // 0x1d

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

  }

  }

















  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 {

























core/java/android/os/Build.java



+2
−1




























Original line number
Original line
Diff line number
Diff line








@@ -976,7 +976,8 @@ public class Build {









         * to come. Con permiso, Capitan. The hall is rented, the orchestra







         * to come. Con permiso, Capitan. The hall is rented, the orchestra











         * engaged. It's now time to see if you can dance.</em>







         * engaged. It's now time to see if you can dance.</em>











         */







         */











        public static final int Q = 29;







        public static final int Q = CUR_DEVELOPMENT;


























    }







    }































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







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

































tools/aapt/SdkConstants.h



+0
−1




























Original line number
Original line
Diff line number
Diff line








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









    SDK_O = 26,







    SDK_O = 26,











    SDK_O_MR1 = 27,







    SDK_O_MR1 = 27,











    SDK_P = 28,







    SDK_P = 28,











    SDK_Q = 29,














};







};































#endif // H_AAPT_SDK_CONSTANTS






#endif // H_AAPT_SDK_CONSTANTS
























tools/aapt2/SdkConstants.h



+0
−1




























Original line number
Original line
Diff line number
Diff line








@@ -54,7 +54,6 @@ enum : ApiVersion {









  SDK_O = 26,







  SDK_O = 26,











  SDK_O_MR1 = 27,







  SDK_O_MR1 = 27,











  SDK_P = 28,







  SDK_P = 28,











  SDK_Q = 29,














};







};































ApiVersion FindAttributeSdkLevel(const ResourceId& id);







ApiVersion FindAttributeSdkLevel(const ResourceId& id);