commit d27954e05a3b73933a42048109bdf0a7690c9cb6
author Benoit Goby <benoit@android.com> Mon Apr 11 18:53:57 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 11 18:53:57 2011 -0700
tree 0e98ba6bc8353292deb3bbf6ebc88d87911a52c2
parent 75b5e9967f4c61642316c8a8a861c51d2aa3faeb
parent c40de32ef747fc206d3ec2980b8f7a7aff0f1967

am c40de32e: resolved conflicts for merge of 6cec7f35 to honeycomb-LTE

* commit 'c40de32ef747fc206d3ec2980b8f7a7aff0f1967':
  Add support for USB Ethernet adapters

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 372d9b5..e867b0b 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);