From fb2cdd7fe476e0684ac24f70ff54c757ef3f3c8a Mon Sep 17 00:00:00 2001
From: Benoit Goby <benoit@android.com>
Date: Wed, 22 Dec 2010 14:29:40 -0800
Subject: [PATCH] Add USB Ethernet support

Change-Id: Idb333f15818f455eedfb62f81358499dc7419f5b
---
 core/java/android/net/ConnectivityManager.java         | 10 ++++++++--
 .../java/com/android/server/ConnectivityService.java   |  5 +++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 3d685cbc76..c08700f1d3 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -213,10 +213,16 @@ public class ConnectivityManager
      */
     public static final int TYPE_WIMAX       = 6;
 
+    /**
+     * Ethernet data connection
+     * @hide
+     */
+    public static final int TYPE_ETHERNET   = 8;
+
     /** {@hide} */
-    public static final int TYPE_DUMMY       = 7;
+    public static final int TYPE_DUMMY       = 9;
     /** {@hide} TODO: Need to adjust this for WiMAX. */
-    public static final int MAX_RADIO_TYPE   = TYPE_WIFI;
+    public static final int MAX_RADIO_TYPE   = TYPE_DUMMY;
     /** {@hide} TODO: Need to adjust this for WiMAX. */
     public static final int MAX_NETWORK_TYPE = TYPE_DUMMY;
 
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index f82a243a6b..8e6e043579 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -18,6 +18,7 @@ package com.android.server;
 
 import android.app.Notification;
 import android.app.NotificationManager;
+import android.net.EthernetDataTracker;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -412,6 +413,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                         mNetAttributes[netType].mName);
                 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);