From fd1da115cbf09b7dd9bca3c7d3a4fb816a835dc5 Mon Sep 17 00:00:00 2001 From: Matthew Xie Date: Sun, 7 Oct 2012 23:46:41 -0700 Subject: Turn off dbg messages, be prepared for production build bug 7174712 Change-Id: I58747ec6507da8ea8ae27a182b601aaf626ede42 --- src/com/android/bluetooth/a2dp/A2dpService.java | 2 +- .../android/bluetooth/a2dp/A2dpStateMachine.java | 30 ++++++++-------------- .../android/bluetooth/btservice/AdapterApp.java | 2 +- .../bluetooth/btservice/AdapterProperties.java | 8 +++--- .../bluetooth/btservice/AdapterService.java | 2 +- .../android/bluetooth/btservice/AdapterState.java | 2 +- .../bluetooth/btservice/BondStateMachine.java | 2 +- .../bluetooth/btservice/ProfileService.java | 2 +- .../android/bluetooth/btservice/RemoteDevices.java | 2 +- src/com/android/bluetooth/hdp/HealthService.java | 4 +-- src/com/android/bluetooth/hfp/HeadsetService.java | 2 +- .../android/bluetooth/hfp/HeadsetStateMachine.java | 14 +++++----- src/com/android/bluetooth/hid/HidService.java | 4 +-- src/com/android/bluetooth/opp/Constants.java | 2 +- src/com/android/bluetooth/pan/PanService.java | 6 ++--- .../bluetooth/pbap/BluetoothPbapService.java | 2 +- 16 files changed, 38 insertions(+), 48 deletions(-) diff --git a/src/com/android/bluetooth/a2dp/A2dpService.java b/src/com/android/bluetooth/a2dp/A2dpService.java index 26503b606..e8caef9d9 100755 --- a/src/com/android/bluetooth/a2dp/A2dpService.java +++ b/src/com/android/bluetooth/a2dp/A2dpService.java @@ -21,7 +21,7 @@ import com.android.bluetooth.btservice.ProfileService; * @hide */ public class A2dpService extends ProfileService { - private static final boolean DBG = true; + private static final boolean DBG = false; private static final String TAG="A2dpService"; private A2dpStateMachine mStateMachine; diff --git a/src/com/android/bluetooth/a2dp/A2dpStateMachine.java b/src/com/android/bluetooth/a2dp/A2dpStateMachine.java index d70296672..dc79fb2e1 100755 --- a/src/com/android/bluetooth/a2dp/A2dpStateMachine.java +++ b/src/com/android/bluetooth/a2dp/A2dpStateMachine.java @@ -47,7 +47,7 @@ import java.util.Set; final class A2dpStateMachine extends StateMachine { private static final String TAG = "A2dpStateMachine"; - private static final boolean DBG = true; + private static final boolean DBG = false; static final int CONNECT = 1; static final int DISCONNECT = 2; @@ -154,11 +154,9 @@ final class A2dpStateMachine extends StateMachine { @Override public boolean processMessage(Message message) { log("Disconnected process message: " + message.what); - if (DBG) { - if (mCurrentDevice != null || mTargetDevice != null || mIncomingDevice != null) { - log("ERROR: current, target, or mIncomingDevice not null in Disconnected"); - return NOT_HANDLED; - } + if (mCurrentDevice != null || mTargetDevice != null || mIncomingDevice != null) { + Log.e(TAG, "ERROR: current, target, or mIncomingDevice not null in Disconnected"); + return NOT_HANDLED; } boolean retValue = HANDLED; @@ -415,9 +413,7 @@ final class A2dpStateMachine extends StateMachine { // The stack is connecting to target device or // there is an incoming connection from the target device at the same time // we already broadcasted the intent, doing nothing here - if (DBG) { - log("Stack and target device are connecting"); - } + log("Stack and target device are connecting"); } else if (mIncomingDevice != null && mIncomingDevice.equals(device)) { Log.e(TAG, "Another connecting event on the incoming device"); @@ -461,11 +457,9 @@ final class A2dpStateMachine extends StateMachine { @Override public boolean processMessage(Message message) { log("Connected process message: " + message.what); - if (DBG) { - if (mCurrentDevice == null) { - log("ERROR: mCurrentDevice is null in Connected"); - return NOT_HANDLED; - } + if (mCurrentDevice == null) { + Log.e(TAG, "ERROR: mCurrentDevice is null in Connected"); + return NOT_HANDLED; } boolean retValue = HANDLED; @@ -690,7 +684,7 @@ final class A2dpStateMachine extends StateMachine { intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); mContext.sendBroadcast(intent, A2dpService.BLUETOOTH_PERM); - if (DBG) log("A2DP Playing state : device: " + device + " State:" + prevState + "->" + state); + log("A2DP Playing state : device: " + device + " State:" + prevState + "->" + state); } private byte[] getByteAddress(BluetoothDevice device) { @@ -715,9 +709,7 @@ final class A2dpStateMachine extends StateMachine { } private void log(String msg) { - if (DBG) { - Log.d(TAG, msg); - } + Log.d(TAG, msg); } private class StackEvent { @@ -739,7 +731,7 @@ final class A2dpStateMachine extends StateMachine { intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device); intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); mContext.sendBroadcast(intent, ProfileService.BLUETOOTH_PERM); - if (DBG) log("Connection state " + device + ": " + prevState + "->" + state); + log("Connection state " + device + ": " + prevState + "->" + state); mService.notifyProfileConnectionStateChanged(device, BluetoothProfile.A2DP, state, prevState); } diff --git a/src/com/android/bluetooth/btservice/AdapterApp.java b/src/com/android/bluetooth/btservice/AdapterApp.java index f2d989e48..a7f90e8d9 100644 --- a/src/com/android/bluetooth/btservice/AdapterApp.java +++ b/src/com/android/bluetooth/btservice/AdapterApp.java @@ -13,7 +13,7 @@ import android.util.Log; public class AdapterApp extends Application { private static final String TAG = "BluetoothAdapterApp"; - private static final boolean DBG = true; + private static final boolean DBG = false; //For Debugging only private static int sRefCount=0; diff --git a/src/com/android/bluetooth/btservice/AdapterProperties.java b/src/com/android/bluetooth/btservice/AdapterProperties.java index 80f51b3a3..9b7b2a633 100755 --- a/src/com/android/bluetooth/btservice/AdapterProperties.java +++ b/src/com/android/bluetooth/btservice/AdapterProperties.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.ArrayList; class AdapterProperties { - private static final boolean DBG = true; + private static final boolean DBG = false; private static final String TAG = "BluetoothAdapterProperties"; private static final int BD_ADDR_LEN = 6; // 6 bytes @@ -180,7 +180,7 @@ class AdapterProperties { */ void setState(int mState) { synchronized (mObject) { - Log.d(TAG,"Setting state to " + mState); + debugLog("Setting state to " + mState); this.mState = mState; } } @@ -190,7 +190,7 @@ class AdapterProperties { */ int getState() { synchronized (mObject) { - Log.d(TAG,"State = " + mState); + debugLog("State = " + mState); return mState; } } @@ -300,7 +300,7 @@ class AdapterProperties { convertToAdapterState(prevState)); intent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); mService.sendBroadcast(intent, mService.BLUETOOTH_PERM); - debugLog("CONNECTION_STATE_CHANGE: " + device + ": " + Log.d(TAG, "CONNECTION_STATE_CHANGE: " + device + ": " + prevState + " -> " + state); } } diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java index 35ca31027..d421b51cb 100755 --- a/src/com/android/bluetooth/btservice/AdapterService.java +++ b/src/com/android/bluetooth/btservice/AdapterService.java @@ -56,7 +56,7 @@ import android.os.ServiceManager; public class AdapterService extends Service { private static final String TAG = "BluetoothAdapterService"; - private static final boolean DBG = true; + private static final boolean DBG = false; private static final boolean TRACE_REF = true; //For Debugging only private static int sRefCount=0; diff --git a/src/com/android/bluetooth/btservice/AdapterState.java b/src/com/android/bluetooth/btservice/AdapterState.java index de0c5d37f..ea1309466 100755 --- a/src/com/android/bluetooth/btservice/AdapterState.java +++ b/src/com/android/bluetooth/btservice/AdapterState.java @@ -24,7 +24,7 @@ import com.android.internal.util.StateMachine; */ final class AdapterState extends StateMachine { - private static final boolean DBG = true; + private static final boolean DBG = false; private static final String TAG = "BluetoothAdapterState"; static final int USER_TURN_ON = 1; diff --git a/src/com/android/bluetooth/btservice/BondStateMachine.java b/src/com/android/bluetooth/btservice/BondStateMachine.java index b9b8eda12..d192ddc83 100755 --- a/src/com/android/bluetooth/btservice/BondStateMachine.java +++ b/src/com/android/bluetooth/btservice/BondStateMachine.java @@ -31,7 +31,7 @@ import java.util.ArrayList; */ final class BondStateMachine extends StateMachine { - private static final boolean DBG = true; + private static final boolean DBG = false; private static final String TAG = "BluetoothBondStateMachine"; static final int CREATE_BOND = 1; diff --git a/src/com/android/bluetooth/btservice/ProfileService.java b/src/com/android/bluetooth/btservice/ProfileService.java index baaf40397..fab9ad8a5 100644 --- a/src/com/android/bluetooth/btservice/ProfileService.java +++ b/src/com/android/bluetooth/btservice/ProfileService.java @@ -15,7 +15,7 @@ import android.os.IBinder; import android.util.Log; public abstract class ProfileService extends Service { - private static final boolean DBG = true; + private static final boolean DBG = false; //For Debugging only private static HashMap sReferenceCount = new HashMap(); diff --git a/src/com/android/bluetooth/btservice/RemoteDevices.java b/src/com/android/bluetooth/btservice/RemoteDevices.java index 48b740c9a..df83b678d 100755 --- a/src/com/android/bluetooth/btservice/RemoteDevices.java +++ b/src/com/android/bluetooth/btservice/RemoteDevices.java @@ -23,7 +23,7 @@ import java.util.LinkedList; final class RemoteDevices { - private static final boolean DBG = true; + private static final boolean DBG = false; private static final String TAG = "BluetoothRemoteDevices"; diff --git a/src/com/android/bluetooth/hdp/HealthService.java b/src/com/android/bluetooth/hdp/HealthService.java index f689cfcb1..c338a6f3b 100755 --- a/src/com/android/bluetooth/hdp/HealthService.java +++ b/src/com/android/bluetooth/hdp/HealthService.java @@ -42,7 +42,7 @@ import com.android.bluetooth.btservice.ProfileService.IProfileServiceBinder; * @hide */ public class HealthService extends ProfileService { - private static final boolean DBG = true; + private static final boolean DBG = false; private static final String TAG="HealthService"; private List mHealthChannels; @@ -560,7 +560,7 @@ public class HealthService extends ProfileService { BluetoothDevice device, int state, int prevState, ParcelFileDescriptor fd, int id) { broadcastHealthDeviceStateChange(device, state); - if (DBG) log("Health Device Callback: " + device + " State Change: " + prevState + "->" + + log("Health Device Callback: " + device + " State Change: " + prevState + "->" + state); ParcelFileDescriptor dupedFd = null; diff --git a/src/com/android/bluetooth/hfp/HeadsetService.java b/src/com/android/bluetooth/hfp/HeadsetService.java index 0920be476..a64b086d5 100755 --- a/src/com/android/bluetooth/hfp/HeadsetService.java +++ b/src/com/android/bluetooth/hfp/HeadsetService.java @@ -31,7 +31,7 @@ import com.android.bluetooth.btservice.ProfileService; * @hide */ public class HeadsetService extends ProfileService { - private static final boolean DBG = true; + private static final boolean DBG = false; private static final String TAG = "HeadsetService"; private static final String MODIFY_PHONE_STATE = android.Manifest.permission.MODIFY_PHONE_STATE; diff --git a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java index 3c8106f07..b4f637c63 100755 --- a/src/com/android/bluetooth/hfp/HeadsetStateMachine.java +++ b/src/com/android/bluetooth/hfp/HeadsetStateMachine.java @@ -54,7 +54,7 @@ import java.util.Set; final class HeadsetStateMachine extends StateMachine { private static final String TAG = "HeadsetStateMachine"; - private static final boolean DBG = true; + private static final boolean DBG = false; //For Debugging only private static int sRefCount=0; @@ -240,11 +240,9 @@ final class HeadsetStateMachine extends StateMachine { @Override public boolean processMessage(Message message) { log("Disconnected process message: " + message.what); - if (DBG) { - if (mCurrentDevice != null || mTargetDevice != null || mIncomingDevice != null) { - log("ERROR: current, target, or mIncomingDevice not null in Disconnected"); - return NOT_HANDLED; - } + if (mCurrentDevice != null || mTargetDevice != null || mIncomingDevice != null) { + Log.e(TAG, "ERROR: current, target, or mIncomingDevice not null in Disconnected"); + return NOT_HANDLED; } boolean retValue = HANDLED; @@ -1225,7 +1223,7 @@ final class HeadsetStateMachine extends StateMachine { // This method does not check for error conditon (newState == prevState) private void broadcastConnectionState(BluetoothDevice device, int newState, int prevState) { - if (DBG) log("Connection state " + device + ": " + prevState + "->" + newState); + log("Connection state " + device + ": " + prevState + "->" + newState); if(prevState == BluetoothProfile.STATE_CONNECTED) { // Headset is disconnecting, stop Virtual call if active. terminateScoUsingVirtualVoiceCall(); @@ -1254,7 +1252,7 @@ final class HeadsetStateMachine extends StateMachine { intent.putExtra(BluetoothProfile.EXTRA_STATE, newState); intent.putExtra(BluetoothDevice.EXTRA_DEVICE, device); mService.sendBroadcast(intent, HeadsetService.BLUETOOTH_PERM); - if (DBG) log("Audio state " + device + ": " + prevState + "->" + newState); + log("Audio state " + device + ": " + prevState + "->" + newState); } private void configAudioParameters() diff --git a/src/com/android/bluetooth/hid/HidService.java b/src/com/android/bluetooth/hid/HidService.java index f15692c84..8d38e0ee9 100755 --- a/src/com/android/bluetooth/hid/HidService.java +++ b/src/com/android/bluetooth/hid/HidService.java @@ -34,7 +34,7 @@ import com.android.bluetooth.btservice.AdapterService; * @hide */ public class HidService extends ProfileService { - private static final boolean DBG = true; + private static final boolean DBG = false; private static final String TAG = "HidService"; private Map mInputDevices; @@ -555,7 +555,7 @@ public class HidService extends ProfileService { /* Notifying the connection state change of the profile before sending the intent for connection state change, as it was causing a race condition, with the UI not being updated with the correct connection state. */ - if (DBG) log("Connection state " + device + ": " + prevState + "->" + newState); + log("Connection state " + device + ": " + prevState + "->" + newState); notifyProfileConnectionStateChanged(device, BluetoothProfile.INPUT_DEVICE, newState, prevState); Intent intent = new Intent(BluetoothInputDevice.ACTION_CONNECTION_STATE_CHANGED); diff --git a/src/com/android/bluetooth/opp/Constants.java b/src/com/android/bluetooth/opp/Constants.java index cd57643d0..b17c0e4e4 100644 --- a/src/com/android/bluetooth/opp/Constants.java +++ b/src/com/android/bluetooth/opp/Constants.java @@ -231,7 +231,7 @@ public class Constants { /** * Verbose level logging */ - public static final boolean VERBOSE = true; + public static final boolean VERBOSE = false; /** use TCP socket instead of Rfcomm Socket to develop */ public static final boolean USE_TCP_DEBUG = false; diff --git a/src/com/android/bluetooth/pan/PanService.java b/src/com/android/bluetooth/pan/PanService.java index f5d5ff2fc..71bcd7a84 100755 --- a/src/com/android/bluetooth/pan/PanService.java +++ b/src/com/android/bluetooth/pan/PanService.java @@ -44,7 +44,7 @@ import com.android.bluetooth.btservice.ProfileService; */ public class PanService extends ProfileService { private static final String TAG = "PanService"; - private static final boolean DBG = true; + private static final boolean DBG = false; private static final String BLUETOOTH_IFACE_ADDR_START= "192.168.44.1"; private static final int BLUETOOTH_MAX_PAN_CONNECTIONS = 5; @@ -206,7 +206,7 @@ public class PanService extends ProfileService { public void setBluetoothTethering(boolean value) { PanService service = getService(); if (service == null) return; - if(DBG) Log.d(TAG, "setBluetoothTethering: " + value +", mTetherOn: " + service.mTetherOn); + Log.d(TAG, "setBluetoothTethering: " + value +", mTetherOn: " + service.mTetherOn); service.setBluetoothTethering(value); } @@ -416,7 +416,7 @@ public class PanService extends ProfileService { /* Notifying the connection state change of the profile before sending the intent for connection state change, as it was causing a race condition, with the UI not being updated with the correct connection state. */ - if (DBG) Log.d(TAG, "Pan Device state : device: " + device + " State:" + + Log.d(TAG, "Pan Device state : device: " + device + " State:" + prevState + "->" + state); notifyProfileConnectionStateChanged(device, BluetoothProfile.PAN, state, prevState); Intent intent = new Intent(BluetoothPan.ACTION_CONNECTION_STATE_CHANGED); diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapService.java b/src/com/android/bluetooth/pbap/BluetoothPbapService.java index 53810aac7..08aa99a2b 100755 --- a/src/com/android/bluetooth/pbap/BluetoothPbapService.java +++ b/src/com/android/bluetooth/pbap/BluetoothPbapService.java @@ -78,7 +78,7 @@ public class BluetoothPbapService extends Service { public static final boolean DEBUG = true; - public static final boolean VERBOSE = true; + public static final boolean VERBOSE = false; /** * Intent indicating incoming obex authentication request which is from -- cgit v1.2.3