Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "RESTRICT AUTOMERGE: [MTE] Update manifest IDs to align with NDK."

Browse Source
This commit is contained in:
Jeff Sharkey
2021-09-07 22:48:27 +00:00
committed by Gerrit Code Review
parent c892758881 304bb210a2
commit c8eb0a1df7
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -954,7 +954,7 @@ package android {
field public static final int measureWithLargestChild = 16843476; // 0x10102d4 field public static final int measureWithLargestChild = 16843476; // 0x10102d4
field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad
field public static final int mediaRouteTypes = 16843694; // 0x10103ae field public static final int mediaRouteTypes = 16843694; // 0x10103ae
field public static final int memtagMode = 16844313; // 0x1010619 field public static final int memtagMode = 16844324; // 0x1010624
field public static final int menuCategory = 16843230; // 0x10101de field public static final int menuCategory = 16843230; // 0x10101de
field public static final int mimeGroup = 16844309; // 0x1010615 field public static final int mimeGroup = 16844309; // 0x1010615
field public static final int mimeType = 16842790; // 0x1010026 field public static final int mimeType = 16842790; // 0x1010026
@@ -978,7 +978,7 @@ package android {
field public static final int multiArch = 16843918; // 0x101048e field public static final int multiArch = 16843918; // 0x101048e
field public static final int multiprocess = 16842771; // 0x1010013 field public static final int multiprocess = 16842771; // 0x1010013
field public static final int name = 16842755; // 0x1010003 field public static final int name = 16842755; // 0x1010003
field public static final int nativeHeapZeroInitialized = 16844314; // 0x101061a field public static final int nativeHeapZeroInitialized = 16844325; // 0x1010625
field public static final int navigationBarColor = 16843858; // 0x1010452 field public static final int navigationBarColor = 16843858; // 0x1010452
field public static final int navigationBarDividerColor = 16844141; // 0x101056d field public static final int navigationBarDividerColor = 16844141; // 0x101056d
field public static final int navigationContentDescription = 16843969; // 0x10104c1 field public static final int navigationContentDescription = 16843969; // 0x10104c1

3
core/res/res/values/public.xml
View File

@@ -3046,6 +3046,9 @@
<public name="canPauseRecording" /> <public name="canPauseRecording" />
<!-- attribute definitions go here --> <!-- attribute definitions go here -->
<public name="requireDeviceScreenOn" /> <public name="requireDeviceScreenOn" />
</public-group>
<public-group type="attr" first-id="0x01010624">
<public name="memtagMode" /> <public name="memtagMode" />
<public name="nativeHeapZeroInitialized" /> <public name="nativeHeapZeroInitialized" />
</public-group> </public-group>