commit 1bb3f75b0547cf992a39cef3f4fe9b6a6d74eeb3
author junyulai <junyulai@google.com> Fri Mar 19 20:23:45 2021 +0800
committer junyulai <junyulai@google.com> Fri Mar 19 21:59:45 2021 +0800
tree cb28b640f9a491f149b3e37268b01cc622c76ccf
parent a499eef3942685e5f7f23e544ad4bd542c28f791

Remove reference of getActiveLinkproperties

For callers who access the hidden API, replaced with
public APIs.

Test: atest FrameworksNetTests
Bug: 182963397
Change-Id: Ic0e895c77cf3efb78ddc333c4f3b1016cebcfe17

services/core/java/com/android/server/VpnManagerService.java

diff --git a/services/core/java/com/android/server/VpnManagerService.java b/services/core/java/com/android/server/VpnManagerService.java
index 56aabc20..d756c1f 100644
--- a/services/core/java/com/android/server/VpnManagerService.java
+++ b/services/core/java/com/android/server/VpnManagerService.java
@@ -352,7 +352,10 @@
     @Override
     public void startLegacyVpn(VpnProfile profile) {
         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) {
             throw new IllegalStateException("Missing active network connection");
         }