Merge "Add Tethering's UID to the legacy type NetworkCapabilities"

This commit is contained in:
Treehugger Robot
2018-01-27 07:20:10 +00:00
committed by Gerrit Code Review

View File

@@ -24,6 +24,7 @@ import static android.net.ConnectivityManager.TYPE_MOBILE_HIPRI;
import android.content.Context; import android.content.Context;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.Process;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.ConnectivityManager.NetworkCallback; import android.net.ConnectivityManager.NetworkCallback;
import android.net.IpPrefix; import android.net.IpPrefix;
@@ -476,6 +477,7 @@ public class UpstreamNetworkMonitor {
ConnectivityManager.getNetworkTypeName(type)); ConnectivityManager.getNetworkTypeName(type));
continue; continue;
} }
nc.setSingleUid(Process.myUid());
for (NetworkState value : netStates) { for (NetworkState value : netStates) {
if (!nc.satisfiedByNetworkCapabilities(value.networkCapabilities)) { if (!nc.satisfiedByNetworkCapabilities(value.networkCapabilities)) {