drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up debug messages" into jb-mr1.1-dev

Browse Source
This commit is contained in:
Matthew Xie
2012-12-03 11:23:49 -08:00
committed by Android (Google) Code Review
parent fdc0d9295f d77982ef29
commit 4fd38e8d13
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/bluetooth/BluetoothAdapter.java
View File

@ -1212,7 +1212,7 @@ public final class BluetoothAdapter {
final private IBluetoothManagerCallback mManagerCallback = final private IBluetoothManagerCallback mManagerCallback =
new IBluetoothManagerCallback.Stub() { new IBluetoothManagerCallback.Stub() {
public void onBluetoothServiceUp(IBluetooth bluetoothService) { public void onBluetoothServiceUp(IBluetooth bluetoothService) {
if (DBG) Log.d(TAG, "onBluetoothServiceUp: " + bluetoothService); if (VDBG) Log.d(TAG, "onBluetoothServiceUp: " + bluetoothService);
synchronized (mManagerCallback) { synchronized (mManagerCallback) {
mService = bluetoothService; mService = bluetoothService;
for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){ for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){
@ -1228,7 +1228,7 @@ public final class BluetoothAdapter {
} }
public void onBluetoothServiceDown() { public void onBluetoothServiceDown() {
if (DBG) Log.d(TAG, "onBluetoothServiceDown: " + mService); if (VDBG) Log.d(TAG, "onBluetoothServiceDown: " + mService);
synchronized (mManagerCallback) { synchronized (mManagerCallback) {
mService = null; mService = null;
for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){ for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){

2
core/java/android/bluetooth/BluetoothSocket.java
View File

@ -429,7 +429,7 @@ public final class BluetoothSocket implements Closeable {
@Override @Override
public void close() throws IOException { public void close() throws IOException {
Log.d(TAG, "close() in, this: " + this + ", channel: " + mPort + ", state: " + mSocketState); if (VDBG) Log.d(TAG, "close() in, this: " + this + ", channel: " + mPort + ", state: " + mSocketState);
if(mSocketState == SocketState.CLOSED) if(mSocketState == SocketState.CLOSED)
return; return;
else else