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

Throw UnsupportedOperationException if startLegacyVpn is called

Browse Source 
Legacy VPN is deprecated starting from Android S. So this API
shouldn't be called if the initial SDK version of device is
Android S+. Otherwise, UnsupportedOperationException will be
thrown.

Bug: 189808606
Test: 1. make gts && gts-tradefed
      2. run gts --module GtsNetworkStackHostTestCases
Change-Id: I00f49555bbbc8ccf270056f0e4d1bfdd927ef26d
Merged-In: I00f49555bbbc8ccf270056f0e4d1bfdd927ef26d
This commit is contained in:
lucaslin
2021-06-23 08:17:55 +08:00
parent 2963649fe4
commit 3eb2a54e31
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/VpnManager.java
View File

@@ -389,6 +389,10 @@ public class VpnManager {
/** /**
* Starts a legacy VPN. * Starts a legacy VPN.
*
* Legacy VPN is deprecated starting from Android S. So this API shouldn't be called if the
* initial SDK version of device is Android S+. Otherwise, UnsupportedOperationException will be
* thrown.
* @hide * @hide
*/ */
public void startLegacyVpn(VpnProfile profile) { public void startLegacyVpn(VpnProfile profile) {

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

@@ -38,6 +38,7 @@ import android.net.VpnManager;
import android.net.VpnService; import android.net.VpnService;
import android.net.util.NetdService; import android.net.util.NetdService;
import android.os.Binder; import android.os.Binder;
import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.HandlerThread; import android.os.HandlerThread;
import android.os.INetworkManagementService; import android.os.INetworkManagementService;
@@ -348,9 +349,17 @@ public class VpnManagerService extends IVpnManager.Stub {
/** /**
* Start legacy VPN, controlling native daemons as needed. Creates a * Start legacy VPN, controlling native daemons as needed. Creates a
* secondary thread to perform connection work, returning quickly. * secondary thread to perform connection work, returning quickly.
*
* Legacy VPN is deprecated starting from Android S. So this API shouldn't be called if the
* initial SDK version of device is Android S+. Otherwise, UnsupportedOperationException will be
* thrown.
*/ */
@SuppressWarnings("AndroidFrameworkCompatChange") // This is not an app-visible API.
@Override @Override
public void startLegacyVpn(VpnProfile profile) { public void startLegacyVpn(VpnProfile profile) {
if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.S) {
throw new UnsupportedOperationException("Legacy VPN is deprecated");
}
int user = UserHandle.getUserId(mDeps.getCallingUid()); int user = UserHandle.getUserId(mDeps.getCallingUid());
// Note that if the caller is not system (uid >= Process.FIRST_APPLICATION_UID), // 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 // the code might not work well since getActiveNetwork might return null if the uid is