summaryrefslogtreecommitdiffstats
path: root/core/java/android/bluetooth
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2011-08-23 21:26:51 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-08-23 21:26:51 -0700
commit006efb24706378293a2faa137c7c7ca34a2e15cd (patch)
tree287eaa365c75af4216e4f6b8b64a6f8411fd0f1d /core/java/android/bluetooth
parent96daa0ef4088b0e123a7dce20f572238ec42575b (diff)
parent8e28b7d78232f6cf08739ca0d129cc7f9e650801 (diff)
downloadframeworks_base-006efb24706378293a2faa137c7c7ca34a2e15cd.zip
frameworks_base-006efb24706378293a2faa137c7c7ca34a2e15cd.tar.gz
frameworks_base-006efb24706378293a2faa137c7c7ca34a2e15cd.tar.bz2
Merge "Proactively disable data when over policy limit."
Diffstat (limited to 'core/java/android/bluetooth')
-rw-r--r--core/java/android/bluetooth/BluetoothTetheringDataTracker.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/core/java/android/bluetooth/BluetoothTetheringDataTracker.java b/core/java/android/bluetooth/BluetoothTetheringDataTracker.java
index a7b0037..83d1bda 100644
--- a/core/java/android/bluetooth/BluetoothTetheringDataTracker.java
+++ b/core/java/android/bluetooth/BluetoothTetheringDataTracker.java
@@ -19,7 +19,6 @@ package android.bluetooth;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.DhcpInfoInternal;
-import android.net.LinkAddress;
import android.net.LinkCapabilities;
import android.net.LinkProperties;
import android.net.NetworkInfo;
@@ -30,7 +29,6 @@ import android.os.Handler;
import android.os.Message;
import android.util.Log;
-import java.net.InetAddress;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -184,11 +182,14 @@ public class BluetoothTetheringDataTracker implements NetworkStateTracker {
return -1;
}
- /**
- * @param enabled
- */
- public void setDataEnable(boolean enabled) {
- android.util.Log.d(TAG, "setDataEnabled: IGNORING enabled=" + enabled);
+ @Override
+ public void setUserDataEnable(boolean enabled) {
+ Log.w(TAG, "ignoring setUserDataEnable(" + enabled + ")");
+ }
+
+ @Override
+ public void setPolicyDataEnable(boolean enabled) {
+ Log.w(TAG, "ignoring setPolicyDataEnable(" + enabled + ")");
}
/**