commit 98c8ad92e5eb831602fd6e396530b75eeda7fcc6
author Erik Kline <ek@google.com> Sat Jan 27 07:53:11 2018 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jan 27 07:53:11 2018 +0000
tree a67ed5cc6dc6388ac8f21a938ad04178657795d5
parent 18ffea713046bef8938ad741666d9f5a6d165cc6
parent 5e6b525f32a2bcb1ccfae238a527786134820b1e

Merge "Add Tethering's UID to the legacy type NetworkCapabilities" am: 2aed62d664 am: d98c6b91a5
am: 5e6b525f32

Change-Id: Icff5c0ca59fc04377bd6beeff09e65b0d2170f17

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

diff --git a/services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java b/services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java
index b35ed75..3413291 100644
--- a/services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java
+++ b/services/core/java/com/android/server/connectivity/tethering/UpstreamNetworkMonitor.java
@@ -24,6 +24,7 @@
 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 @@
                        ConnectivityManager.getNetworkTypeName(type));
                 continue;
             }
+            nc.setSingleUid(Process.myUid());
 
             for (NetworkState value : netStates) {
                 if (!nc.satisfiedByNetworkCapabilities(value.networkCapabilities)) {