commit 2aed62d6645879de71050995acd5dbc5b377c6ec
author Treehugger Robot <treehugger-gerrit@google.com> Sat Jan 27 07:20:10 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Jan 27 07:20:10 2018 +0000
tree 0efe29ca3f27fb3188bc9806a813833b1ea2d99a
parent 35520445bec4819a487a3770d5c760814c7f47a0
parent 89c6362def55a9ef20626b21c5b72f30dc8c2219

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

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)) {