diff options
| author | Erik Kline <ek@google.com> | 2015-01-22 07:18:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-22 07:18:00 +0000 |
| commit | 61b07b4016ebdbfe7215c0cc03fd65ddf55c6703 (patch) | |
| tree | 829deb3bfc95013fafd9d38a365e0decaf78e7ec /services | |
| parent | 54dbd1fd437862346f7cdacc484acd3e10501bfb (diff) | |
| parent | 4f3615036db441c4a099dc789ebcdf641ac5a987 (diff) | |
| download | frameworks_base-61b07b4016ebdbfe7215c0cc03fd65ddf55c6703.zip frameworks_base-61b07b4016ebdbfe7215c0cc03fd65ddf55c6703.tar.gz frameworks_base-61b07b4016ebdbfe7215c0cc03fd65ddf55c6703.tar.bz2 | |
Merge "Log interface name and uid when filtering a blocked network." into lmp-mr1-dev automerge: 147cf4b
automerge: 4f36150
* commit '4f3615036db441c4a099dc789ebcdf641ac5a987':
Log interface name and uid when filtering a blocked network.
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 5 |
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); |