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

* commit 'c40de32ef7':
  Add support for USB Ethernet adapters
This commit is contained in:
Benoit Goby 2011-04-11 18:53:57 -07:00 • committed by Android Git Automerger
commit d27954e05a

View file

@ -24,6 +24,7 @@ import android.content.pm.PackageManager;
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 @@ public class ConnectivityService extends IConnectivityManager.Stub {
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);