summaryrefslogtreecommitdiffstats
path: root/core/java/android/bluetooth
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2011-04-07 14:22:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-07 14:22:03 -0700
commit80f7c594fae3f1b19e3ea78938de450418fe183c (patch)
treecd17f77bf1022f1dd132aecd6d13aa604b89e3c6 /core/java/android/bluetooth
parent567882e1f9a31d78cba8ea7f1112d0a9e42d137a (diff)
parentf4a29403ae5b6d3e8e754a025d33f0c33adecb21 (diff)
downloadframeworks_base-80f7c594fae3f1b19e3ea78938de450418fe183c.zip
frameworks_base-80f7c594fae3f1b19e3ea78938de450418fe183c.tar.gz
frameworks_base-80f7c594fae3f1b19e3ea78938de450418fe183c.tar.bz2
am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp
* commit 'f4a29403ae5b6d3e8e754a025d33f0c33adecb21': Add external dependency API.
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
+ }
}