OSDN Git Service

Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev
authorHugo Benichi <hugobenichi@google.com>
Tue, 4 Apr 2017 00:50:20 +0000 (00:50 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 4 Apr 2017 00:50:24 +0000 (00:50 +0000)
commitdf9cf5450cec9bc8b92d25a66c1f348cdc4b3498
tree24dfafc46cd1d00d91a69274953a24ef190483b8
parent5efad86b916cb506b57bacfe48d7ddb8639507fb
parent938ab4fa3942398e942d98aa7b16dd87dfb7ff11
Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/net/NetworkPolicyManagerService.java