commit fbba87d35ff2622323b0992ede22b4255fd72495
author Robert Greenwalt <rgreenwalt@google.com> Wed Mar 30 16:40:23 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 30 16:40:23 2011 -0700
tree 65a86b3bcdf762fab68cc32c3cebf11094b15e21
parent b471d761d29480727577834eaf917874541e6dc2
parent 3a378b9f2d889fff5d0f595682d8525d5ad0acdf

am 047f9d12: Merge "resolved conflicts for merge of b2f5deca to honeycomb-plus-aosp" into honeycomb-plus-aosp

* commit '047f9d12976d90d0931a64a256bb4843d77f5e20':
  Fix some alt-network issues.

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 c26b051..0b0e1ef 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;
@@ -420,6 +421,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 " +
                         mNetAttributes[netType].mRadio);