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

Commit 98c8ad92 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Merge "Add Tethering's UID to the legacy type NetworkCapabilities" am: 2aed62d6 am: d98c6b91 

am: 5e6b525f

Change-Id: Icff5c0ca59fc04377bd6beeff09e65b0d2170f17
parents 18ffea71 5e6b525f

services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import static android.net.ConnectivityManager.TYPE_MOBILE_HIPRI; 
import android.content.Context;

import android.os.Handler;

import android.os.Looper;

import android.os.Process;

import android.net.ConnectivityManager;

import android.net.ConnectivityManager.NetworkCallback;

import android.net.IpPrefix;
@@ -476,6 +477,7 @@ public class UpstreamNetworkMonitor { 
                       ConnectivityManager.getNetworkTypeName(type));

                continue;

            }

            nc.setSingleUid(Process.myUid());



            for (NetworkState value : netStates) {

                if (!nc.satisfiedByNetworkCapabilities(value.networkCapabilities)) {