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

Commit f9143c6a authored by Steven Moreland's avatar Steven Moreland
Browse files

DO NOT MERGE: Revert "Add VanillaIceCream to android.os.Build" 

Revert V changes in U branches. V changes are needed to help
resolve merge conflicts as this topic lands in downstream
branches.

Bug: 275409981
Test: N/A

This reverts commit c7ffdf8b.

Change-Id: I9422db9c0d980468b7f4678fe06866d06c8c7c31
parent de160153

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -32654,7 +32654,6 @@ package android.os { 
    field public static final int S_V2 = 32; // 0x20

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

    field public static final int UPSIDE_DOWN_CAKE = 34; // 0x22

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

  }















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

























core/java/android/os/Build.java



+0
−5




























Original line number
Diff line number
Diff line








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













         * Upside Down Cake.















         */















        public static final int UPSIDE_DOWN_CAKE = 34;



























        /**













         * Vanilla Ice Cream.













         */













        public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT;















    }































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