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

Commit 87ccbfaa authored by Svet Ganov's avatar Svet Ganov
Browse files

Updating platform SDK version for R 

  * Finalize resources
  * Update appt/aapt2 constants
  * Update R and SDK constants
  * Fix a crashloop bug

Test: build + boot

bug:150281259

Exempt-From-Owner-Approval: merge conflict resolution

Change-Id: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
Merged-In: Ie56e12336cd1fcf347ac7164f6988b0c2da77c7d
parent a4faa660

api/current.txt

+9 −9
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ package android { 
    field public static final int allowBackup = 16843392; // 0x1010280

    field public static final int allowClearUserData = 16842757; // 0x1010005

    field public static final int allowEmbedded = 16843765; // 0x10103f5

    field public static final int allowNativeHeapPointerTagging = 16844307; // 0x1010613

    field public static final int allowNativeHeapPointerTagging = 16844306; // 0x1010612

    field public static final int allowParallelSyncs = 16843570; // 0x1010332

    field public static final int allowSingleTap = 16843353; // 0x1010259

    field public static final int allowTaskReparenting = 16843268; // 0x1010204
@@ -326,7 +326,7 @@ package android { 
    field public static final int autoLink = 16842928; // 0x10100b0

    field public static final int autoMirrored = 16843754; // 0x10103ea

    field public static final int autoRemoveFromRecents = 16843847; // 0x1010447

    field public static final int autoRevokePermissions = 16844309; // 0x1010615

    field public static final int autoRevokePermissions = 16844307; // 0x1010613

    field public static final int autoSizeMaxTextSize = 16844102; // 0x1010546

    field public static final int autoSizeMinTextSize = 16844088; // 0x1010538

    field public static final int autoSizePresetSizes = 16844087; // 0x1010537
@@ -391,7 +391,7 @@ package android { 
    field public static final int canRequestFingerprintGestures = 16844109; // 0x101054d

    field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7

    field public static final int canRetrieveWindowContent = 16843653; // 0x1010385

    field public static final int canTakeScreenshot = 16844304; // 0x1010610

    field public static final int canTakeScreenshot = 16844303; // 0x101060f

    field public static final int candidatesTextStyleSpans = 16843312; // 0x1010230

    field public static final int cantSaveState = 16844142; // 0x101056e

    field @Deprecated public static final int capitalize = 16843113; // 0x1010169
@@ -486,7 +486,7 @@ package android { 
    field public static final int countDown = 16844059; // 0x101051b

    field public static final int country = 16843962; // 0x10104ba

    field public static final int cropToPadding = 16843043; // 0x1010123

    field public static final int crossProfile = 16844303; // 0x101060f

    field public static final int crossProfile = 16844302; // 0x101060e

    field public static final int cursorVisible = 16843090; // 0x1010152

    field public static final int customNavigationLayout = 16843474; // 0x10102d2

    field public static final int customTokens = 16843579; // 0x101033b
@@ -708,7 +708,7 @@ package android { 
    field public static final int gravity = 16842927; // 0x10100af

    field public static final int gridViewStyle = 16842865; // 0x1010071

    field public static final int groupIndicator = 16843019; // 0x101010b

    field public static final int gwpAsanMode = 16844312; // 0x1010618

    field public static final int gwpAsanMode = 16844310; // 0x1010616

    field public static final int hand_hour = 16843011; // 0x1010103

    field public static final int hand_minute = 16843012; // 0x1010104

    field public static final int handle = 16843354; // 0x101025a
@@ -953,7 +953,7 @@ package android { 
    field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad

    field public static final int mediaRouteTypes = 16843694; // 0x10103ae

    field public static final int menuCategory = 16843230; // 0x10101de

    field public static final int mimeGroup = 16844311; // 0x1010617

    field public static final int mimeGroup = 16844309; // 0x1010615

    field public static final int mimeType = 16842790; // 0x1010026

    field public static final int min = 16844089; // 0x1010539

    field public static final int minAspectRatio = 16844187; // 0x101059b
@@ -1082,7 +1082,7 @@ package android { 
    field public static final int preferenceScreenStyle = 16842891; // 0x101008b

    field public static final int preferenceStyle = 16842894; // 0x101008e

    field public static final int presentationTheme = 16843712; // 0x10103c0

    field public static final int preserveLegacyExternalStorage = 16844310; // 0x1010616

    field public static final int preserveLegacyExternalStorage = 16844308; // 0x1010614

    field public static final int previewImage = 16843482; // 0x10102da

    field public static final int primaryContentAlpha = 16844114; // 0x1010552

    field public static final int priority = 16842780; // 0x101001c
@@ -1345,7 +1345,7 @@ package android { 
    field public static final int summaryOff = 16843248; // 0x10101f0

    field public static final int summaryOn = 16843247; // 0x10101ef

    field public static final int supportsAssist = 16844016; // 0x10104f0

    field public static final int supportsInlineSuggestions = 16844302; // 0x101060e

    field public static final int supportsInlineSuggestions = 16844301; // 0x101060d

    field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1

    field public static final int supportsLocalInteraction = 16844047; // 0x101050f

    field public static final int supportsMultipleDisplays = 16844182; // 0x1010596
@@ -35871,7 +35871,7 @@ package android.os { 
    field public static final int O_MR1 = 27; // 0x1b

    field public static final int P = 28; // 0x1c

    field public static final int Q = 29; // 0x1d

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

    field public static final int R = 30; // 0x1e

  }















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

























api/removed.txt



+0
−8




























Original line number
Diff line number
Diff line















// Signature format: 2.0













package android {



























  public static final class R.attr {













    field public static final int featureId = 16844301; // 0x101060d













  }



























}





























package android.app {































  public class ActivityManager {

































api/system-current.txt



+5
−5




























Original line number
Diff line number
Diff line








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













  public static final class R.attr {















    field public static final int allowClearUserDataOnFailedRestore = 16844288; // 0x1010600















    field public static final int isVrOnly = 16844152; // 0x1010578













    field public static final int minExtensionVersion = 16844306; // 0x1010612













    field public static final int minExtensionVersion = 16844305; // 0x1010611















    field public static final int requiredSystemPropertyName = 16844133; // 0x1010565















    field public static final int requiredSystemPropertyValue = 16844134; // 0x1010566













    field public static final int sdkVersion = 16844305; // 0x1010611













    field public static final int sdkVersion = 16844304; // 0x1010610















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















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















  }










@@ -291,8 +291,8 @@ package android {













  public static final class R.string {















    field public static final int config_defaultAssistant = 17039393; // 0x1040021















    field public static final int config_defaultBrowser = 17039394; // 0x1040022













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













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













    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_defaultSms = 17039396; // 0x1040024















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









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













    field public static final int config_helpIntentNameKey = 17039390; // 0x104001e















    field public static final int config_helpPackageNameKey = 17039387; // 0x104001b















    field public static final int config_helpPackageNameValue = 17039388; // 0x104001c













    field public static final int config_systemGallery = 17039402; // 0x104002a













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















  }





























  public static final class R.style {

































api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








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













  public static final class R.string {















    field public static final int config_defaultAssistant = 17039393; // 0x1040021















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













    field public static final int config_systemGallery = 17039402; // 0x104002a













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















  }































}

































core/java/android/os/Build.java



+1
−1




























Original line number
Diff line number
Diff line








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













        /**















         * R.















         */













        public static final int R = CUR_DEVELOPMENT;













        public static final int R = 30;















    }































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