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

Merge "Minor fixes to LockdownVpnTracker."

Browse Source
This commit is contained in:
Lorenzo Colitti
2021-02-15 06:25:16 +00:00
committed by Gerrit Code Review
parent 5e1e48904b 1f4db552bd
commit fb84feedb1
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -4910,12 +4910,15 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (!mLockdownEnabled) { if (!mLockdownEnabled) {
return null; return null;
} }
// The legacy lockdown VPN always only applies to UID 0. // The legacy lockdown VPN always only applies to userId 0.
final NetworkAgentInfo nai = getVpnForUid(Process.FIRST_APPLICATION_UID); final NetworkAgentInfo nai = getVpnForUid(Process.FIRST_APPLICATION_UID);
if (nai == null || !isLegacyLockdownNai(nai)) return null; if (nai == null || !isLegacyLockdownNai(nai)) return null;
// The legacy lockdown VPN must always have exactly one underlying network. // The legacy lockdown VPN must always have exactly one underlying network.
if (nai.declaredUnderlyingNetworks == null || nai.declaredUnderlyingNetworks.length != 1) { // This code may run on any thread and declaredUnderlyingNetworks may change, so store it in
// a local variable. There is no need to make a copy because its contents cannot change.
final Network[] underlying = nai.declaredUnderlyingNetworks;
if (underlying == null || underlying.length != 1) {
return null; return null;
} }
@@ -4925,8 +4928,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// Report that the VPN is not connected, so when the state of NetworkInfo objects // Report that the VPN is not connected, so when the state of NetworkInfo objects
// overwritten by getLegacyLockdownState will be set to CONNECTING and not CONNECTED. // overwritten by getLegacyLockdownState will be set to CONNECTING and not CONNECTED.
final NetworkAgentInfo defaultNetwork = getDefaultNetwork(); final NetworkAgentInfo defaultNetwork = getDefaultNetwork();
if (defaultNetwork == null if (defaultNetwork == null || !defaultNetwork.network.equals(underlying[0])) {
|| !defaultNetwork.network.equals(nai.declaredUnderlyingNetworks[0])) {
return null; return null;
} }
@@ -4985,6 +4987,9 @@ public class ConnectivityService extends IConnectivityManager.Stub
private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() { private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
// TODO: make BroadcastInterceptingContext use the Handler passed in to registerReceiver
// and put this back.
// ensureRunningOnConnectivityServiceThread();
final String action = intent.getAction(); final String action = intent.getAction();
final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL); final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL);