LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Throw IAE when Network's LinkProperties is null

Browse Source 
Improve the setUnderlyingNetwork method by throwing IAE
when Network's LinkProperties is null. Also update the
API doc to give caller more guidance in using this API

Bug: 232309601
Test: UT: IpSecServiceParameterizedTest, IpSecServiceTest,
      IpSecServiceRefcountedResourceTest, IpSecManagerTest, VpnTest
Test: CTS: IpSecManagerTest, IpSecManagerTunnelTest, Ikev2VpnTest
Test: make doc-comment-check-docs
Change-Id: Idab4706b0db42ed2222fb48b168589ed005d2f2f
This commit is contained in:
Yan Yan
2022-05-16 17:13:45 -07:00
parent ae30d8c052
commit be3eb3d56a
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
framework-t/src/android/net/IpSecManager.java
View File

@@ -817,10 +817,10 @@ public class IpSecManager {
* </ol>
*
* @param underlyingNetwork the new {@link Network} that will carry traffic for this tunnel.
* This network MUST never be the network exposing this IpSecTunnelInterface, otherwise
* this method will throw an {@link IllegalArgumentException}. If the
* IpSecTunnelInterface is later added to this network, all outbound traffic will be
* blackholed.
* This network MUST be a functional {@link Network} with valid {@link LinkProperties},
* and MUST never be the network exposing this IpSecTunnelInterface, otherwise this
* method will throw an {@link IllegalArgumentException}. If the IpSecTunnelInterface is
* later added to this network, all outbound traffic will be blackholed.
*/
// TODO: b/169171001 Update the documentation when transform migration is supported.
// The purpose of making updating network and applying transforms separate is to leave open
@@ -962,7 +962,6 @@ public class IpSecManager {
* IP header and IPsec Header on all inbound traffic).
* <p>Applications should probably not use this API directly.
*
*
* @param tunnel The {@link IpSecManager#IpSecTunnelInterface} that will use the supplied
* transform.
* @param direction the direction, {@link DIRECTION_OUT} or {@link #DIRECTION_IN} in which