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

Commit 3a870e4d authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

Merge changes from topic "UpsideDownCake-SDK-Finalization" into udc-dev 

* changes:
  DO NOT MERGE: Revert "Add VanillaIceCream to android.os.Build"
  UpsideDownCake is now 34
  Add VanillaIceCream to android.os.Build
parents f3306444 f9143c6a

core/api/current.txt

+125 −125

File changed.

Preview size limit exceeded, changes collapsed.

core/api/system-current.txt

+9 −9
Original line number Diff line number Diff line
@@ -410,14 +410,14 @@ package android { 
    field public static final int sdkVersion = 16844304; // 0x1010610

    field public static final int supportsAmbientMode = 16844173; // 0x101058d

    field public static final int userRestriction = 16844164; // 0x1010584

    field public static final int visualQueryDetectionService;

    field public static final int visualQueryDetectionService = 16844410; // 0x101067a

  }















  public static final class R.bool {













    field public static final int config_enableDefaultNotes;













    field public static final int config_enableDefaultNotesForWorkProfile;













    field public static final int config_enableDefaultNotes = 17891338; // 0x111000a













    field public static final int config_enableDefaultNotesForWorkProfile = 17891339; // 0x111000b















    field public static final int config_enableQrCodeScannerOnLockScreen = 17891336; // 0x1110008













    field public static final int config_safetyProtectionEnabled;













    field public static final int config_safetyProtectionEnabled = 17891337; // 0x1110009















    field public static final int config_sendPackageName = 17891328; // 0x1110000















    field public static final int config_showDefaultAssistant = 17891329; // 0x1110001















    field public static final int config_showDefaultEmergency = 17891330; // 0x1110002









@@ -430,7 +430,7 @@ package android {



























  public static final class R.dimen {















    field public static final int config_restrictedIconSize = 17104903; // 0x1050007













    field public static final int config_viewConfigurationHandwritingGestureLineMargin;













    field public static final int config_viewConfigurationHandwritingGestureLineMargin = 17104906; // 0x105000a















  }





























  public static final class R.drawable {









@@ -452,7 +452,7 @@ package android {













    field public static final int config_defaultCallRedirection = 17039397; // 0x1040025















    field public static final int config_defaultCallScreening = 17039398; // 0x1040026















    field public static final int config_defaultDialer = 17039395; // 0x1040023













    field public static final int config_defaultNotes;













    field public static final int config_defaultNotes = 17039429; // 0x1040045















    field public static final int config_defaultSms = 17039396; // 0x1040024















    field public static final int config_devicePolicyManagement = 17039421; // 0x104003d















    field public static final int config_feedbackIntentExtraKey = 17039391; // 0x104001f









@@ -468,10 +468,10 @@ package android {













    field public static final int config_systemAutomotiveCalendarSyncManager = 17039423; // 0x104003f















    field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028















    field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029













    field public static final int config_systemCallStreaming;













    field public static final int config_systemCallStreaming = 17039431; // 0x1040047















    field public static final int config_systemCompanionDeviceProvider = 17039417; // 0x1040039















    field public static final int config_systemContacts = 17039403; // 0x104002b













    field public static final int config_systemFinancedDeviceController;













    field public static final int config_systemFinancedDeviceController = 17039430; // 0x1040046















    field public static final int config_systemGallery = 17039399; // 0x1040027















    field public static final int config_systemNotificationIntelligence = 17039413; // 0x1040035















    field public static final int config_systemSettingsIntelligence = 17039426; // 0x1040042









@@ -483,7 +483,7 @@ package android {













    field public static final int config_systemUi = 17039418; // 0x104003a















    field public static final int config_systemUiIntelligence = 17039410; // 0x1040032















    field public static final int config_systemVisualIntelligence = 17039415; // 0x1040037













    field public static final int config_systemWearHealthService;













    field public static final int config_systemWearHealthService = 17039428; // 0x1040044















    field public static final int config_systemWellbeing = 17039408; // 0x1040030















    field public static final int config_systemWifiCoexManager = 17039407; // 0x104002f















    field public static final int safety_protection_display_text = 17039425; // 0x1040041

























core/java/android/os/Build.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -1222,7 +1222,7 @@ public class Build {













        /**















         * Upside Down Cake.















         */













        public static final int UPSIDE_DOWN_CAKE = CUR_DEVELOPMENT;













        public static final int UPSIDE_DOWN_CAKE = 34;















    }































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

































core/res/res/values/public-final.xml



+339
−0


























File changed.
Preview size limit exceeded, changes collapsed.
























core/res/res/values/public-staging.xml



+19
−185


























File changed.
Preview size limit exceeded, changes collapsed.