summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorErik Kline <ek@google.com>2015-01-23 16:35:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-23 16:35:55 +0000
commitda01f0ff3d0339dbaecdc4c8e9329e2be3e231b7 (patch)
tree631e4bde4e2ff3b77b6fa8d41c159069a496e68d /services
parente2819727c0c6a1fdc2f1597cfe42237ab1ee82f6 (diff)
parent147cf4b8c4345f2d086251313583888356317d2d (diff)
downloadframeworks_base-da01f0ff3d0339dbaecdc4c8e9329e2be3e231b7.zip
frameworks_base-da01f0ff3d0339dbaecdc4c8e9329e2be3e231b7.tar.gz
frameworks_base-da01f0ff3d0339dbaecdc4c8e9329e2be3e231b7.tar.bz2
am 147cf4b8: Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev
* commit '147cf4b8c4345f2d086251313583888356317d2d': Log interface name and uid when filtering a blocked network.
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 8cc3d2c..944f1c0 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -907,7 +907,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
// network is blocked; clone and override state
info = new NetworkInfo(info);
info.setDetailedState(DetailedState.BLOCKED, null, null);
- if (DBG) log("returning Blocked NetworkInfo");
+ if (DBG) {
+ log("returning Blocked NetworkInfo for ifname=" +
+ lp.getInterfaceName() + ", uid=" + uid);
+ }
}
if (info != null && mLockdownTracker != null) {
info = mLockdownTracker.augmentNetworkInfo(info);