commit 2ed1cda859702a8c2fbf64c89a2eb07040df24a0
author chiachangwang <chiachangwang@google.com> Thu Sep 01 01:26:36 2022 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Tue Sep 20 03:39:06 2022 +0000
tree a5655683dc7d9eea465707586c6ee553641d2e56
parent 1c2c0b52584895d4999ff7a47eeea89ced8fd2ca

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