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

Merge "Remove reference of getActiveLinkproperties" am: 79ddf1afb8 am: fc25cb26f9

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

Change-Id: I6ab8cba01e409686202d046dae22658face9d06b
This commit is contained in:
Treehugger Robot
2021-03-22 15:09:39 +00:00
committed by Automerger Merge Worker
parent ea7be3a489 fc25cb26f9
commit 7f7751db58
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/VpnManagerService.java
View File

@@ -352,7 +352,10 @@ public class VpnManagerService extends IVpnManager.Stub {
@Override @Override
public void startLegacyVpn(VpnProfile profile) { public void startLegacyVpn(VpnProfile profile) {
int user = UserHandle.getUserId(mDeps.getCallingUid()); int user = UserHandle.getUserId(mDeps.getCallingUid());
final LinkProperties egress = mCm.getActiveLinkProperties(); // Note that if the caller is not system (uid >= Process.FIRST_APPLICATION_UID),
// the code might not work well since getActiveNetwork might return null if the uid is
// blocked by NetworkPolicyManagerService.
final LinkProperties egress = mCm.getLinkProperties(mCm.getActiveNetwork());
if (egress == null) { if (egress == null) {
throw new IllegalStateException("Missing active network connection"); throw new IllegalStateException("Missing active network connection");
} }