summaryrefslogtreecommitdiff
path: root/tools/aapt/Command.cpp
diff options
context:
space:
mode:
author chiachangwang <chiachangwang@google.com> 2022-09-01 01:26:36 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> 2022-09-20 03:39:06 +0000
commit2ed1cda859702a8c2fbf64c89a2eb07040df24a0 (patch)
treea5655683dc7d9eea465707586c6ee553641d2e56 /tools/aapt/Command.cpp
parent1c2c0b52584895d4999ff7a47eeea89ced8fd2ca (diff)
Skip duplicate parameters when IkeTunnelConnectionParams provided
For those fields existing in the IkeTunnelConnectionParams, the value should be retrieved from the object to honor the setting in the object. IkeTunnelConnectionParams are serialized in a safe manner to ensure that they do not conflict with the serialization scheme of VpnProfile. However, copying some of these fields(e.g. IkeKeyId) may conflict with the serialization scheme. Bug: 243718982 Test: atest FrameworksNetTests CtsNetTestCases Change-Id: I510c47e26feabd5cebe9497ef495e4d729d0f7c6 (cherry picked from commit 84afc69b95dee89fd4e7a9567dc3ef8dd56bc385) Merged-In: I510c47e26feabd5cebe9497ef495e4d729d0f7c6
Diffstat (limited to 'tools/aapt/Command.cpp')
0 files changed, 0 insertions, 0 deletions