summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2014-05-22 01:01:50 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-22 01:01:50 +0000
commitf1cc12950c52ba7669fe1edfd8900aab1c40b78b (patch)
tree4290c6096b3dbe9bfcf2bc20bb72fb17afdf0b7c /services
parent4440705d57537f8a6a50f64a745fa3d867bf8cc9 (diff)
parent3c44c99af500601fbb8ba6b8f71e5d930ca5e269 (diff)
downloadframeworks_base-f1cc12950c52ba7669fe1edfd8900aab1c40b78b.zip
frameworks_base-f1cc12950c52ba7669fe1edfd8900aab1c40b78b.tar.gz
frameworks_base-f1cc12950c52ba7669fe1edfd8900aab1c40b78b.tar.bz2
Merge "Delete the EthernetDataTracker."
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/ConnectivityService.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index af53fef..0ad5ce2 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -23,7 +23,6 @@ import static android.net.ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE;
import static android.net.ConnectivityManager.NetworkCallbackListener;
import static android.net.ConnectivityManager.TYPE_BLUETOOTH;
import static android.net.ConnectivityManager.TYPE_DUMMY;
-import static android.net.ConnectivityManager.TYPE_ETHERNET;
import static android.net.ConnectivityManager.TYPE_MOBILE;
import static android.net.ConnectivityManager.TYPE_MOBILE_MMS;
import static android.net.ConnectivityManager.TYPE_MOBILE_SUPL;
@@ -65,7 +64,6 @@ import android.database.ContentObserver;
import android.net.CaptivePortalTracker;
import android.net.ConnectivityManager;
import android.net.DummyDataStateTracker;
-import android.net.EthernetDataTracker;
import android.net.IConnectivityManager;
import android.net.INetworkManagementEventObserver;
import android.net.INetworkPolicyListener;
@@ -824,8 +822,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
return BluetoothTetheringDataTracker.getInstance();
case TYPE_WIMAX:
return makeWimaxStateTracker(mContext, mTrackerHandler);
- case TYPE_ETHERNET:
- return EthernetDataTracker.getInstance();
case TYPE_PROXY:
return new ProxyDataTracker();
default: