commit c40de32ef747fc206d3ec2980b8f7a7aff0f1967
author Benoit Goby <benoit@android.com> Mon Apr 11 18:41:23 2011 -0700
committer Benoit Goby <benoit@android.com> Mon Apr 11 18:41:23 2011 -0700
tree 69349b3f3d1b04b3a0c4288b1d7ad5ce61fe25e0
parent f2a6283da98e1d3ab5d386c5893a0228a7da2939
parent 6cec7f3535f9ed410d0704c8c2e38a5231e6d5c9

resolved conflicts for merge of 6cec7f35 to honeycomb-LTE

Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92

services/java/com/android/server/ConnectivityService.java

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index f4dc69a..998382c 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -24,6 +24,7 @@
 import android.database.ContentObserver;
 import android.net.ConnectivityManager;
 import android.net.DummyDataStateTracker;
+import android.net.EthernetDataTracker;
 import android.net.IConnectivityManager;
 import android.net.LinkProperties;
 import android.net.MobileDataStateTracker;
@@ -408,6 +409,10 @@
                 mNetTrackers[netType] = BluetoothTetheringDataTracker.getInstance();
                 mNetTrackers[netType].startMonitoring(context, mHandler);
                 break;
+            case ConnectivityManager.TYPE_ETHERNET:
+                mNetTrackers[netType] = EthernetDataTracker.getInstance();
+                mNetTrackers[netType].startMonitoring(context, mHandler);
+                break;
             default:
                 loge("Trying to create a DataStateTracker for an unknown radio type " +
                         mNetConfigs[netType].radio);