diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2009-03-18 11:33:14 -0700 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2009-03-18 11:33:14 -0700 |
commit | 2a73de7b21a89aa2ba4c254d28658b49793425b2 (patch) | |
tree | ded5bcd581464b4174d81c373044b6d36eee58d2 /core/java/android/bluetooth/BluetoothA2dp.java | |
parent | 42e48026b21a962e5bf40344d738665ecbd9d74d (diff) | |
parent | ba87e3e6c985e7175152993b5efcc7dd2f0e1c93 (diff) | |
download | frameworks_base-2a73de7b21a89aa2ba4c254d28658b49793425b2.zip frameworks_base-2a73de7b21a89aa2ba4c254d28658b49793425b2.tar.gz frameworks_base-2a73de7b21a89aa2ba4c254d28658b49793425b2.tar.bz2 |
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
Diffstat (limited to 'core/java/android/bluetooth/BluetoothA2dp.java')
-rw-r--r-- | core/java/android/bluetooth/BluetoothA2dp.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/bluetooth/BluetoothA2dp.java b/core/java/android/bluetooth/BluetoothA2dp.java index b0b0154..2ea45d5 100644 --- a/core/java/android/bluetooth/BluetoothA2dp.java +++ b/core/java/android/bluetooth/BluetoothA2dp.java @@ -49,6 +49,7 @@ import java.util.List; */ public class BluetoothA2dp { private static final String TAG = "BluetoothA2dp"; + private static final boolean DBG = false; /** int extra for SINK_STATE_CHANGED_ACTION */ public static final String SINK_STATE = @@ -103,6 +104,7 @@ public class BluetoothA2dp { * @hide */ public int connectSink(String address) { + if (DBG) log("connectSink(" + address + ")"); try { return mService.connectSink(address); } catch (RemoteException e) { @@ -119,6 +121,7 @@ public class BluetoothA2dp { * @hide */ public int disconnectSink(String address) { + if (DBG) log("disconnectSink(" + address + ")"); try { return mService.disconnectSink(address); } catch (RemoteException e) { @@ -133,6 +136,7 @@ public class BluetoothA2dp { * @hide */ public boolean isSinkConnected(String address) { + if (DBG) log("isSinkConnected(" + address + ")"); int state = getSinkState(address); return state == STATE_CONNECTED || state == STATE_PLAYING; } @@ -142,6 +146,7 @@ public class BluetoothA2dp { * @hide */ public List<String> listConnectedSinks() { + if (DBG) log("listConnectedSinks()"); try { return mService.listConnectedSinks(); } catch (RemoteException e) { @@ -156,6 +161,7 @@ public class BluetoothA2dp { * @hide */ public int getSinkState(String address) { + if (DBG) log("getSinkState(" + address + ")"); try { return mService.getSinkState(address); } catch (RemoteException e) { @@ -177,6 +183,7 @@ public class BluetoothA2dp { * @return Result code, negative indicates an error */ public int setSinkPriority(String address, int priority) { + if (DBG) log("setSinkPriority(" + address + ", " + priority + ")"); try { return mService.setSinkPriority(address, priority); } catch (RemoteException e) { @@ -191,6 +198,7 @@ public class BluetoothA2dp { * @return non-negative priority, or negative error code on error. */ public int getSinkPriority(String address) { + if (DBG) log("getSinkPriority(" + address + ")"); try { return mService.getSinkPriority(address); } catch (RemoteException e) { @@ -244,4 +252,8 @@ public class BluetoothA2dp { return "<unknown state " + state + ">"; } } + + private static void log(String msg) { + Log.d(TAG, msg); + } } |