Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 521d2e9f authored by Aaron Huang's avatar Aaron Huang Committed by Android (Google) Code Review
Browse files

Merge "Make ipsec resource as SystemApi"

parents 855f0288 90812426
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -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 {
+2 −0
Original line number Diff line number Diff line
@@ -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">