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

Commit 2fd5575f authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Add UpsideDownCake to aapt2 codenames and android.os.Build"

parents b45a3bc7 d27566da

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -30982,6 +30982,7 @@ package android.os { 
    field public static final int S = 31; // 0x1f

    field public static final int S = 31; // 0x1f

    field public static final int S_V2 = 32; // 0x20

    field public static final int S_V2 = 32; // 0x20

    field public static final int TIRAMISU = 33; // 0x21

    field public static final int TIRAMISU = 33; // 0x21

    field public static final int UPSIDE_DOWN_CAKE = 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



+5
−0




























Original line number
Original line
Diff line number
Diff line








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









         * Tiramisu.







         * Tiramisu.











         */







         */











        public static final int TIRAMISU = 33;







        public static final int TIRAMISU = 33;





























        /**














         * Upside Down Cake.














         */














        public static final int UPSIDE_DOWN_CAKE = CUR_DEVELOPMENT;











    }







    }































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







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

































tools/aapt2/SdkConstants.cpp



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -27,7 +27,7 @@ namespace aapt {





























static ApiVersion sDevelopmentSdkLevel = 10000;







static ApiVersion sDevelopmentSdkLevel = 10000;











static const auto sDevelopmentSdkCodeNames =







static const auto sDevelopmentSdkCodeNames =











    std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu"});







    std::unordered_set<StringPiece>({"Q", "R", "S", "Sv2", "Tiramisu", "UpsideDownCake"});































static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {







static const std::vector<std::pair<uint16_t, ApiVersion>> sAttrIdMap = {











    {0x021c, 1},







    {0x021c, 1},