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

Commit 6527ebe0 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Throw UnsupportedOperationException if startLegacyVpn is called" into... 

Merge "Throw UnsupportedOperationException if startLegacyVpn is called" into sc-dev am: 3d46c082 am: 3d50a863

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

Change-Id: I60ce7cf6682e58842541a01fced21c7624019d43
parents a6e7ba91 3d50a863

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