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

Merge changes I0b129ec3,I49a5aee1 am: d34c7307f6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2097774

Change-Id: I3b98b1e253e789098341134339f9180b0b8d8db7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Lin
2022-05-16 09:18:50 +00:00
committed by Automerger Merge Worker
parent af69c79996 d34c7307f6
commit 2aacae63e0
1 changed files with 48 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -763,12 +763,20 @@ public class Vpn {
// Also notify the new package if there was a provider change. // Also notify the new package if there was a provider change.
final boolean shouldNotifyNewPkg = isVpnApp(packageName) && isPackageChanged; final boolean shouldNotifyNewPkg = isVpnApp(packageName) && isPackageChanged;
if (setAlwaysOnPackageInternal(packageName, lockdown, lockdownAllowlist)) { if (!setAlwaysOnPackageInternal(packageName, lockdown, lockdownAllowlist)) {
return false;
}
saveAlwaysOnPackage(); saveAlwaysOnPackage();
// TODO(b/230548427): Remove SDK check once VPN related stuff are decoupled from // TODO(b/230548427): Remove SDK check once VPN related stuff are decoupled from
// ConnectivityServiceTest. // ConnectivityServiceTest.
if (shouldNotifyOldPkg && SdkLevel.isAtLeastT()) { if (!SdkLevel.isAtLeastT()) {
// If both of shouldNotifyOldPkg & isPackageChanged are true, which means the return true;
}
if (shouldNotifyOldPkg) {
// If both of shouldNotifyOldPkg & isPackageChanged are true, that means the
// always-on of old package is disabled or the old package is replaced with the new // always-on of old package is disabled or the old package is replaced with the new
// package. In this case, VpnProfileState should be disconnected. // package. In this case, VpnProfileState should be disconnected.
sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED, sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED,
@@ -777,9 +785,8 @@ public class Vpn {
: makeVpnProfileStateLocked(), : makeVpnProfileStateLocked(),
null /* underlyingNetwork */, null /* nc */, null /* lp */); null /* underlyingNetwork */, null /* nc */, null /* lp */);
} }
// TODO(b/230548427): Remove SDK check once VPN related stuff are decoupled from
// ConnectivityServiceTest. if (shouldNotifyNewPkg) {
if (shouldNotifyNewPkg && SdkLevel.isAtLeastT()) {
sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED, sendEventToVpnManagerApp(VpnManager.CATEGORY_EVENT_ALWAYS_ON_STATE_CHANGED,
-1 /* errorClass */, -1 /* errorCode*/, packageName, -1 /* errorClass */, -1 /* errorCode*/, packageName,
getSessionKeyLocked(), makeVpnProfileStateLocked(), getSessionKeyLocked(), makeVpnProfileStateLocked(),
@@ -787,8 +794,6 @@ public class Vpn {
} }
return true; return true;
} }
return false;
}
/** /**
* Configures an always-on VPN connection through a specific application, the same as {@link * Configures an always-on VPN connection through a specific application, the same as {@link
@@ -2644,8 +2649,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) {
@@ -2877,12 +2882,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. */
@@ -2936,9 +2941,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;
@@ -2954,9 +2959,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) {
@@ -2973,9 +2978,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) {
@@ -2988,9 +2993,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
@@ -3002,9 +3007,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
@@ -3016,9 +3021,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) {
@@ -3027,8 +3032,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)
@@ -3093,8 +3098,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();