LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of 6cec7f35 to honeycomb-LTE

Browse Source 
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
This commit is contained in:
Benoit Goby
2011-04-11 18:41:23 -07:00
parent f2a6283da9 6cec7f3535
commit c40de32ef7
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/ConnectivityService.java
View File

@@ -24,6 +24,7 @@ import android.content.pm.PackageManager;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.DummyDataStateTracker; import android.net.DummyDataStateTracker;
import android.net.EthernetDataTracker;
import android.net.IConnectivityManager; import android.net.IConnectivityManager;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.MobileDataStateTracker; import android.net.MobileDataStateTracker;
@@ -408,6 +409,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
mNetTrackers[netType] = BluetoothTetheringDataTracker.getInstance(); mNetTrackers[netType] = BluetoothTetheringDataTracker.getInstance();
mNetTrackers[netType].startMonitoring(context, mHandler); mNetTrackers[netType].startMonitoring(context, mHandler);
break; break;
case ConnectivityManager.TYPE_ETHERNET:
mNetTrackers[netType] = EthernetDataTracker.getInstance();
mNetTrackers[netType].startMonitoring(context, mHandler);
break;
default: default:
loge("Trying to create a DataStateTracker for an unknown radio type " + loge("Trying to create a DataStateTracker for an unknown radio type " +
mNetConfigs[netType].radio); mNetConfigs[netType].radio);