Merge "Make ipsec resource as SystemApi"

2022-01-06 07:27:33 +00:00
parent 855f028893 908124262c
commit 521d2e9faa
2 changed files with 3 additions and 0 deletions
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -342,6 +342,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 {
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -3281,6 +3281,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">