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

Commit 46f106c2 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Make ipsec resource as SystemApi" am: 16c6cfd6 am: 845cbd1a am: 681a3e05 

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

Change-Id: I984afa06f3da786a65bb9ac1094ec687cc333a67
parents 5d486dfa 681a3e05

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -317,6 +317,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 {

























core/res/res/values/public.xml



+2
−0




























Original line number
Diff line number
Diff line








@@ -3259,6 +3259,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">