diff options
| author | 2022-01-26 14:10:18 +0000 | |
|---|---|---|
| committer | 2022-01-26 14:10:18 +0000 | |
| commit | 681a3e054b1eaf761d1052e3b05302dae01a20cd (patch) | |
| tree | 55c5da6ca8d1e46a158082c05fc90f539ce1053a | |
| parent | 99b69aa9f9dfabbb958a72b4633e63b184fc6bcb (diff) | |
| parent | 845cbd1a7171cca8a93dc191f1b2b7be4cb05fd8 (diff) | |
Merge "Make ipsec resource as SystemApi" am: 16c6cfd630 am: 845cbd1a71
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956979
Change-Id: Ib89d32371dfa9c517ef910ec405e42096ad9b402
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 6c8c06160bd7..4a173fd18c8e 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -316,6 +316,7 @@ package android { public static final class R.array { field public static final int config_keySystemUuidMapping = 17235973; // 0x1070005 + field public static final int config_optionalIpSecAlgorithms; } public static final class R.attr { diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 5f89588bdc7d..6ef5bd46dce7 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3239,6 +3239,8 @@ </staging-public-group> <staging-public-group type="array" first-id="0x01d90000"> + <!-- @hide @SystemApi --> + <public name="config_optionalIpSecAlgorithms" /> </staging-public-group> <staging-public-group type="drawable" first-id="0x01d80000"> |