commit 29348dbfca787235ae1eabbe1a8b7b262187f197
author chiachangwang <chiachangwang@google.com> Tue Aug 30 10:13:49 2022 +0000
committer chiachangwang <chiachangwang@google.com> Fri Sep 02 02:51:33 2022 +0000
tree 10e73db011fc1596df4a54246ea88e2633a9bf2e
parent b09fa7a10668b3e157a3d0a52314820f458d8718

Correctly handle null ProxyInfo in Ikev2VpnProfile

This change ensures that null ProxyInfo instances are honored
and reflected in the actual VpnProfile.

Ikev2VpnProfiles incorrectly set ProxyInfo as an empty instance
when provided with a null ProxyInfo. Other components in the
system sometimes have different behavior if presented with an
empty ProxyInfo instead of a null one.

Bug: 244281603
Test: atest FrameworksNetTests
Test: Manual testing with VPN validation enabled
Change-Id: I67ee2aa5c96dc22ba8fcd2be3fd4c090dec20697

core/java/android/net/Ikev2VpnProfile.java

diff --git a/core/java/android/net/Ikev2VpnProfile.java b/core/java/android/net/Ikev2VpnProfile.java
index ba0546a..3979c6c 100644
--- a/core/java/android/net/Ikev2VpnProfile.java
+++ b/core/java/android/net/Ikev2VpnProfile.java
@@ -171,7 +171,7 @@
         mPassword = password;
         mRsaPrivateKey = rsaPrivateKey;
         mUserCert = userCert;
-        mProxyInfo = new ProxyInfo(proxyInfo);
+        mProxyInfo = (proxyInfo == null) ? null : new ProxyInfo(proxyInfo);
 
         // UnmodifiableList doesn't make a defensive copy by default.
         mAllowedAlgorithms = Collections.unmodifiableList(new ArrayList<>(allowedAlgorithms));