Merge "Clean up some logging to make it more useful to debug."

core/java/android/server/BluetoothEventLoop.java

@@ -253,6 +253,7 @@ class BluetoothEventLoop {
             // we filled up our cache.
             mBluetoothService.getAllProperties();
         }
+        log("Property Changed: " + propValues[0] + " : " + propValues[1]);
         String name = propValues[0];
         if (name.equals("Name")) {
             mBluetoothService.setProperty(name, propValues[1]);
@@ -321,10 +322,9 @@ class BluetoothEventLoop {
             Log.e(TAG, "onDevicePropertyChanged: Address of the remote device in null");
             return;
         }
-        if (DBG) {
-            log("Device property changed: " + address + " property: "
-                    + name + " value: " + propValues[1]);
-        }
+        log("Device property changed: " + address + " property: "
+            + name + " value: " + propValues[1]);
+
         BluetoothDevice device = mAdapter.getRemoteDevice(address);
         if (name.equals("Name")) {
             mBluetoothService.setRemoteDeviceProperty(address, name, propValues[1]);

core/jni/android_server_BluetoothEventLoop.cpp

@@ -813,7 +813,7 @@ static DBusHandlerResult event_filter(DBusConnection *conn, DBusMessage *msg,
         return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
     }
 
-    LOGE("%s: Received signal %s:%s from %s", __FUNCTION__,
+    LOGV("%s: Received signal %s:%s from %s", __FUNCTION__,
         dbus_message_get_interface(msg), dbus_message_get_member(msg),
         dbus_message_get_path(msg));