Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename vars of Ikev2VpnRunner

Browse Source 
There is already a var which is named mNetworkCapabilities in Vpn
class. In order to simply distinguish Vpn#mNetworkCapabilities and
Ikev2VpnRunner#mNetworkCapabilities, rename the one in
Ikev2VpnRunner to mUnderlyingNetworkCapabilities, also change
Ikev2VpnRunner#mLinkProperties to mUnderlyingLinkProperties.

Bug: 191413541
Test: atest FrameworksNetTest#VpnTest
Change-Id: I49a5aee159baa1d1583abb94d73da9fbc03ffe07
(cherry picked from commit c9bd64daf3)
Merged-In: I49a5aee159baa1d1583abb94d73da9fbc03ffe07
This commit is contained in:
lucaslin
2022-05-13 04:24:11 +08:00
committed by Cherrypicker Worker
parent 41eb56744d
commit 09eab9ca43
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -2642,8 +2642,8 @@ public class Vpn {
@Nullable private IpSecTunnelInterface mTunnelIface; @Nullable private IpSecTunnelInterface mTunnelIface;
@Nullable private IkeSession mSession; @Nullable private IkeSession mSession;
@Nullable private Network mActiveNetwork; @Nullable private Network mActiveNetwork;
@Nullable private NetworkCapabilities mNetworkCapabilities; @Nullable private NetworkCapabilities mUnderlyingNetworkCapabilities;
@Nullable private LinkProperties mLinkProperties; @Nullable private LinkProperties mUnderlyingLinkProperties;
private final String mSessionKey; private final String mSessionKey;
IkeV2VpnRunner(@NonNull Ikev2VpnProfile profile) { IkeV2VpnRunner(@NonNull Ikev2VpnProfile profile) {
@@ -2875,12 +2875,12 @@ public class Vpn {
/** Called when the NetworkCapabilities of underlying network is changed */ /** Called when the NetworkCapabilities of underlying network is changed */
public void onDefaultNetworkCapabilitiesChanged(@NonNull NetworkCapabilities nc) { public void onDefaultNetworkCapabilitiesChanged(@NonNull NetworkCapabilities nc) {
mNetworkCapabilities = nc; mUnderlyingNetworkCapabilities = nc;
} }
/** Called when the LinkProperties of underlying network is changed */ /** Called when the LinkProperties of underlying network is changed */
public void onDefaultNetworkLinkPropertiesChanged(@NonNull LinkProperties lp) { public void onDefaultNetworkLinkPropertiesChanged(@NonNull LinkProperties lp) {
mLinkProperties = lp; mUnderlyingLinkProperties = lp;
} }
/** Marks the state as FAILED, and disconnects. */ /** Marks the state as FAILED, and disconnects. */
@@ -2934,9 +2934,9 @@ public class Vpn {
getPackage(), mSessionKey, makeVpnProfileStateLocked(), getPackage(), mSessionKey, makeVpnProfileStateLocked(),
mActiveNetwork, mActiveNetwork,
getRedactedNetworkCapabilitiesOfUnderlyingNetwork( getRedactedNetworkCapabilitiesOfUnderlyingNetwork(
this.mNetworkCapabilities), mUnderlyingNetworkCapabilities),
getRedactedLinkPropertiesOfUnderlyingNetwork( getRedactedLinkPropertiesOfUnderlyingNetwork(
this.mLinkProperties)); mUnderlyingLinkProperties));
} }
markFailedAndDisconnect(exception); markFailedAndDisconnect(exception);
return; return;
@@ -2952,9 +2952,9 @@ public class Vpn {
getPackage(), mSessionKey, makeVpnProfileStateLocked(), getPackage(), mSessionKey, makeVpnProfileStateLocked(),
mActiveNetwork, mActiveNetwork,
getRedactedNetworkCapabilitiesOfUnderlyingNetwork( getRedactedNetworkCapabilitiesOfUnderlyingNetwork(
this.mNetworkCapabilities), mUnderlyingNetworkCapabilities),
getRedactedLinkPropertiesOfUnderlyingNetwork( getRedactedLinkPropertiesOfUnderlyingNetwork(
this.mLinkProperties)); mUnderlyingLinkProperties));
} }
} }
} else if (exception instanceof IllegalArgumentException) { } else if (exception instanceof IllegalArgumentException) {
@@ -2971,9 +2971,9 @@ public class Vpn {
getPackage(), mSessionKey, makeVpnProfileStateLocked(), getPackage(), mSessionKey, makeVpnProfileStateLocked(),
mActiveNetwork, mActiveNetwork,
getRedactedNetworkCapabilitiesOfUnderlyingNetwork( getRedactedNetworkCapabilitiesOfUnderlyingNetwork(
this.mNetworkCapabilities), mUnderlyingNetworkCapabilities),
getRedactedLinkPropertiesOfUnderlyingNetwork( getRedactedLinkPropertiesOfUnderlyingNetwork(
this.mLinkProperties)); mUnderlyingLinkProperties));
} }
} else if (exception instanceof IkeNonProtocolException) { } else if (exception instanceof IkeNonProtocolException) {
if (exception.getCause() instanceof UnknownHostException) { if (exception.getCause() instanceof UnknownHostException) {
@@ -2986,9 +2986,9 @@ public class Vpn {
getPackage(), mSessionKey, makeVpnProfileStateLocked(), getPackage(), mSessionKey, makeVpnProfileStateLocked(),
mActiveNetwork, mActiveNetwork,
getRedactedNetworkCapabilitiesOfUnderlyingNetwork( getRedactedNetworkCapabilitiesOfUnderlyingNetwork(
this.mNetworkCapabilities), mUnderlyingNetworkCapabilities),
getRedactedLinkPropertiesOfUnderlyingNetwork( getRedactedLinkPropertiesOfUnderlyingNetwork(
this.mLinkProperties)); mUnderlyingLinkProperties));
} }
} else if (exception.getCause() instanceof IkeTimeoutException) { } else if (exception.getCause() instanceof IkeTimeoutException) {
// TODO(b/230548427): Remove SDK check once VPN related stuff are // TODO(b/230548427): Remove SDK check once VPN related stuff are
@@ -3000,9 +3000,9 @@ public class Vpn {
getPackage(), mSessionKey, makeVpnProfileStateLocked(), getPackage(), mSessionKey, makeVpnProfileStateLocked(),
mActiveNetwork, mActiveNetwork,
getRedactedNetworkCapabilitiesOfUnderlyingNetwork( getRedactedNetworkCapabilitiesOfUnderlyingNetwork(
this.mNetworkCapabilities), mUnderlyingNetworkCapabilities),
getRedactedLinkPropertiesOfUnderlyingNetwork( getRedactedLinkPropertiesOfUnderlyingNetwork(
this.mLinkProperties)); mUnderlyingLinkProperties));
} }
} else if (exception.getCause() instanceof IOException) { } else if (exception.getCause() instanceof IOException) {
// TODO(b/230548427): Remove SDK check once VPN related stuff are // TODO(b/230548427): Remove SDK check once VPN related stuff are
@@ -3014,9 +3014,9 @@ public class Vpn {
getPackage(), mSessionKey, makeVpnProfileStateLocked(), getPackage(), mSessionKey, makeVpnProfileStateLocked(),
mActiveNetwork, mActiveNetwork,
getRedactedNetworkCapabilitiesOfUnderlyingNetwork( getRedactedNetworkCapabilitiesOfUnderlyingNetwork(
this.mNetworkCapabilities), mUnderlyingNetworkCapabilities),
getRedactedLinkPropertiesOfUnderlyingNetwork( getRedactedLinkPropertiesOfUnderlyingNetwork(
this.mLinkProperties)); mUnderlyingLinkProperties));
} }
} }
} else if (exception != null) { } else if (exception != null) {
@@ -3025,8 +3025,8 @@ public class Vpn {
} }
mActiveNetwork = null; mActiveNetwork = null;
mNetworkCapabilities = null; mUnderlyingNetworkCapabilities = null;
mLinkProperties = null; mUnderlyingLinkProperties = null;
// Close all obsolete state, but keep VPN alive incase a usable network comes up. // Close all obsolete state, but keep VPN alive incase a usable network comes up.
// (Mirrors VpnService behavior) // (Mirrors VpnService behavior)
@@ -3091,8 +3091,8 @@ public class Vpn {
*/ */
private void disconnectVpnRunner() { private void disconnectVpnRunner() {
mActiveNetwork = null; mActiveNetwork = null;
mNetworkCapabilities = null; mUnderlyingNetworkCapabilities = null;
mLinkProperties = null; mUnderlyingLinkProperties = null;
mIsRunning = false; mIsRunning = false;
resetIkeState(); resetIkeState();