diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-26 07:36:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-26 07:36:04 +0000 |
| commit | 8af1c3493fa8a855813a538135e274c97aa0a99b (patch) | |
| tree | 13296da2399e22cbee5f0a6e9d3e4b3844cac4fe | |
| parent | 374fe4d7f505f1b28e40a9b2a1e6d9aac3d79495 (diff) | |
| parent | 81658da0875982e28c25b0ec2da34ba85b54d0eb (diff) | |
| download | ethernet-nougat-iot-release.tar.gz | |
Merge "Don't consider TRACK_DEFAULT requests in EthernetNetworkFactory."android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-n-iot-release-ihome-igv1nougat-iot-release
| -rw-r--r-- | java/com/android/server/ethernet/EthernetNetworkFactory.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/com/android/server/ethernet/EthernetNetworkFactory.java b/java/com/android/server/ethernet/EthernetNetworkFactory.java index dc94482..54bcdc3 100644 --- a/java/com/android/server/ethernet/EthernetNetworkFactory.java +++ b/java/com/android/server/ethernet/EthernetNetworkFactory.java @@ -72,6 +72,10 @@ public class EthernetNetworkFactory extends NetworkFactory { @Override public boolean acceptRequest(NetworkRequest request, int score) { + if (request.type == NetworkRequest.Type.TRACK_DEFAULT) { + return false; + } + if (DBG) { Log.d(TAG, "acceptRequest, request: " + request + ", score: " + score); } @@ -424,6 +428,7 @@ public class EthernetNetworkFactory extends NetworkFactory { @Override public String toString() { return getClass().getSimpleName() + "{ " + + "refCount: " + refCount + ", " + "iface: " + name + ", " + "up: " + mLinkUp + ", " + "hwAddress: " + mHwAddress + ", " |