summaryrefslogtreecommitdiffstats
path: root/core/java/android/bluetooth
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2011-04-07 14:13:52 -0700
committerRobert Greenwalt <rgreenwalt@google.com>2011-04-07 14:13:52 -0700
commitf4a29403ae5b6d3e8e754a025d33f0c33adecb21 (patch)
tree2462217b49085f4fd0f4c5931fc7b3e843421f88 /core/java/android/bluetooth
parent91bc0f818c9e4cfdffc09f6edecfd11a1ce1806e (diff)
parent70c3d1c23b5d4398cc561ec9ddbe868b3182cc74 (diff)
downloadframeworks_base-f4a29403ae5b6d3e8e754a025d33f0c33adecb21.zip
frameworks_base-f4a29403ae5b6d3e8e754a025d33f0c33adecb21.tar.gz
frameworks_base-f4a29403ae5b6d3e8e754a025d33f0c33adecb21.tar.bz2
resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f
Diffstat (limited to 'core/java/android/bluetooth')
-rw-r--r--core/java/android/bluetooth/BluetoothTetheringDataTracker.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/bluetooth/BluetoothTetheringDataTracker.java b/core/java/android/bluetooth/BluetoothTetheringDataTracker.java
index c08f14f..a7b0037 100644
--- a/core/java/android/bluetooth/BluetoothTetheringDataTracker.java
+++ b/core/java/android/bluetooth/BluetoothTetheringDataTracker.java
@@ -300,4 +300,8 @@ public class BluetoothTetheringDataTracker implements NetworkStateTracker {
msg = mCsHandler.obtainMessage(EVENT_STATE_CHANGED, mNetworkInfo);
msg.sendToTarget();
}
+
+ public void setDependencyMet(boolean met) {
+ // not supported on this network
+ }
}