Merge "Make ipsec resource as SystemApi"

2022-01-26 13:47:14 +00:00
parent 05e7864df4 1d0076b339
commit 16c6cfd630
2 changed files with 3 additions and 0 deletions
--- 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 {
--- 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">