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

Merge "Make ipsec resource as SystemApi" am: 16c6cfd630 am: 845cbd1a71 am: 681a3e054b

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

Change-Id: I984afa06f3da786a65bb9ac1094ec687cc333a67
This commit is contained in:
Aaron Huang
2022-01-26 14:28:34 +00:00
committed by Automerger Merge Worker
parent 5d486dfa3f 681a3e054b
commit 46f106c2fc
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -317,6 +317,7 @@ package android {
public static final class R.array { public static final class R.array {
field public static final int config_keySystemUuidMapping = 17235973; // 0x1070005 field public static final int config_keySystemUuidMapping = 17235973; // 0x1070005
field public static final int config_optionalIpSecAlgorithms;
} }
public static final class R.attr { public static final class R.attr {

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

@@ -3259,6 +3259,8 @@
</staging-public-group> </staging-public-group>
<staging-public-group type="array" first-id="0x01d90000"> <staging-public-group type="array" first-id="0x01d90000">
<!-- @hide @SystemApi -->
<public name="config_optionalIpSecAlgorithms" />
</staging-public-group> </staging-public-group>
<staging-public-group type="drawable" first-id="0x01d80000"> <staging-public-group type="drawable" first-id="0x01d80000">