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

Commit 888771cb authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove @FlaggedApi for android.os.Build.VANILLA_ICE_CREAM" into main am: 51e8133d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3019625



Change-Id: I7ef7908c21f5170110fe2ec94dd44caacc2c297b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9defcb13 51e8133d

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -31980,7 +31980,7 @@ 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 @FlaggedApi("android.os.android_os_build_vanilla_ice_cream") public static final int VANILLA_ICE_CREAM = 10000; // 0x2710

    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
−2




























Original line number
Diff line number
Diff line








@@ -17,7 +17,6 @@













package android.os;































import android.Manifest;













import android.annotation.FlaggedApi;















import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.RequiresPermission;










@@ -1228,7 +1227,6 @@ public class Build {













        /**















         * Vanilla Ice Cream.















         */













        @FlaggedApi(Flags.FLAG_ANDROID_OS_BUILD_VANILLA_ICE_CREAM)















        public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT;















    }