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

Commit 5bd31476 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Flag the android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM constant"... 

Merge "Flag the android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM constant" into main am: 3b16630e am: 47a697e6 am: 33997a1e

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



Change-Id: I1d70998e08461a7c085f1995387810d9cda114f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a338c16 33997a1e

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -32204,7 +32204,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 public static final int VANILLA_ICE_CREAM = 10000; // 0x2710

    field @FlaggedApi("android.os.android_os_build_vanilla_ice_cream") 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



+2
−0




























Original line number
Diff line number
Diff line








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













package android.os;































import android.Manifest;













import android.annotation.FlaggedApi;















import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.RequiresPermission;










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













        /**















         * Vanilla Ice Cream.















         */













        @FlaggedApi(Flags.FLAG_ANDROID_OS_BUILD_VANILLA_ICE_CREAM)















        public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT;















    }

















































core/java/android/os/flags.aconfig



+7
−0




























Original line number
Diff line number
Diff line















package: "android.os"





























flag {













    name: "android_os_build_vanilla_ice_cream"













    namespace: "build"













    description: "Feature flag for adding the VANILLA_ICE_CREAM constant."













    bug: "264658905"













}





























flag {















    name: "state_of_health_public"















    namespace: "system_sw_battery"