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

Commit 2122d538 authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Add NET_CAPABILITY_NOT_VPN when requesting test network" am: 6ccd0e05... 

Merge "Add NET_CAPABILITY_NOT_VPN when requesting test network" am: 6ccd0e05 am: 46d9f02a am: a4c15d44 am: bae41b28 am: 669a09a1

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



Change-Id: I2cf07c207b41f30943c58abe57561d5884d101a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d04c2870 669a09a1

services/core/java/com/android/server/connectivity/Vpn.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.Manifest.permission.BIND_VPN_SERVICE; 
import static android.Manifest.permission.CONTROL_VPN;

import static android.Manifest.permission.CONTROL_VPN;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_METERED;

import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VPN;

import static android.net.RouteInfo.RTN_THROW;

import static android.net.RouteInfo.RTN_THROW;

import static android.net.RouteInfo.RTN_UNREACHABLE;

import static android.net.RouteInfo.RTN_UNREACHABLE;

import static android.net.VpnManager.NOTIFICATION_CHANNEL_VPN;

import static android.net.VpnManager.NOTIFICATION_CHANNEL_VPN;
@@ -2549,6 +2550,7 @@ public class Vpn { 
                req = new NetworkRequest.Builder()

                req = new NetworkRequest.Builder()

                        .clearCapabilities()

                        .clearCapabilities()

                        .addTransportType(NetworkCapabilities.TRANSPORT_TEST)

                        .addTransportType(NetworkCapabilities.TRANSPORT_TEST)

                        .addCapability(NET_CAPABILITY_NOT_VPN)

                        .build();

                        .build();

            } else {

            } else {

                // Basically, the request here is referring to the default request which is defined

                // Basically, the request here is referring to the default request which is defined