Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1695d3f5 authored by lucaslin's avatar lucaslin Committed by Automerger Merge Worker
Browse files

Throw UnsupportedOperationException if startLegacyVpn is called am: 3eb2a54e 

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

Change-Id: I48567d077ebcc49af645c2d53b14e48b115179f1
parents a940ad42 3eb2a54e

core/java/android/net/VpnManager.java

+4 −0
Original line number Diff line number Diff line
@@ -389,6 +389,10 @@ public class VpnManager { 


    /**

     * 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

     */

    public void startLegacyVpn(VpnProfile profile) {

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

+9 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import android.net.VpnManager; 
import android.net.VpnService;

import android.net.util.NetdService;

import android.os.Binder;

import android.os.Build;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.INetworkManagementService;
@@ -348,9 +349,17 @@ public class VpnManagerService extends IVpnManager.Stub { 
    /**

     * Start legacy VPN, controlling native daemons as needed. Creates a

     * 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

    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());

        // 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