diff options
| author | Steve Block <steveblock@google.com> | 2012-01-06 19:18:35 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2012-01-06 19:18:35 +0000 |
| commit | 9657b13bd143660e9285e9bec379eec12c866110 (patch) | |
| tree | 04af0e64cf667273ba67190b2585f04993336cb8 | |
| parent | 9f71f85140223aa110f29440cfb87de2d760761a (diff) | |
| download | bluetooth-9657b13bd143660e9285e9bec379eec12c866110.tar.gz | |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Id297c768e26290752c1accd2110d10437a73920e
| -rw-r--r-- | bluedroid/bluetooth.c | 22 | ||||
| -rw-r--r-- | brcm_patchram_plus/brcm_patchram_plus.c | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/bluedroid/bluetooth.c b/bluedroid/bluetooth.c index a57b8f7..570cdd9 100644 --- a/bluedroid/bluetooth.c +++ b/bluedroid/bluetooth.c @@ -82,13 +82,13 @@ static int check_bluetooth_power() { fd = open(rfkill_state_path, O_RDONLY); if (fd < 0) { - LOGE("open(%s) failed: %s (%d)", rfkill_state_path, strerror(errno), + ALOGE("open(%s) failed: %s (%d)", rfkill_state_path, strerror(errno), errno); goto out; } sz = read(fd, &buffer, 1); if (sz != 1) { - LOGE("read(%s) failed: %s (%d)", rfkill_state_path, strerror(errno), + ALOGE("read(%s) failed: %s (%d)", rfkill_state_path, strerror(errno), errno); goto out; } @@ -119,13 +119,13 @@ static int set_bluetooth_power(int on) { fd = open(rfkill_state_path, O_WRONLY); if (fd < 0) { - LOGE("open(%s) for write failed: %s (%d)", rfkill_state_path, + ALOGE("open(%s) for write failed: %s (%d)", rfkill_state_path, strerror(errno), errno); goto out; } sz = write(fd, &buffer, 1); if (sz < 0) { - LOGE("write(%s) failed: %s (%d)", rfkill_state_path, strerror(errno), + ALOGE("write(%s) failed: %s (%d)", rfkill_state_path, strerror(errno), errno); goto out; } @@ -139,7 +139,7 @@ out: static inline int create_hci_sock() { int sk = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI); if (sk < 0) { - LOGE("Failed to create bluetooth hci socket: %s (%d)", + ALOGE("Failed to create bluetooth hci socket: %s (%d)", strerror(errno), errno); } return sk; @@ -156,7 +156,7 @@ int bt_enable() { ALOGI("Starting hciattach daemon"); if (property_set("ctl.start", "hciattach") < 0) { - LOGE("Failed to start hciattach"); + ALOGE("Failed to start hciattach"); set_bluetooth_power(0); goto out; } @@ -181,10 +181,10 @@ int bt_enable() { usleep(100000); // 100 ms retry delay } if (attempt == 0) { - LOGE("%s: Timeout waiting for HCI device to come up, error- %d, ", + ALOGE("%s: Timeout waiting for HCI device to come up, error- %d, ", __FUNCTION__, ret); if (property_set("ctl.stop", "hciattach") < 0) { - LOGE("Error stopping hciattach"); + ALOGE("Error stopping hciattach"); } set_bluetooth_power(0); goto out; @@ -192,7 +192,7 @@ int bt_enable() { ALOGI("Starting bluetoothd deamon"); if (property_set("ctl.start", "bluetoothd") < 0) { - LOGE("Failed to start bluetoothd"); + ALOGE("Failed to start bluetoothd"); set_bluetooth_power(0); goto out; } @@ -212,7 +212,7 @@ int bt_disable() { ALOGI("Stopping bluetoothd deamon"); if (property_set("ctl.stop", "bluetoothd") < 0) { - LOGE("Error stopping bluetoothd"); + ALOGE("Error stopping bluetoothd"); goto out; } usleep(HCID_STOP_DELAY_USEC); @@ -223,7 +223,7 @@ int bt_disable() { ALOGI("Stopping hciattach deamon"); if (property_set("ctl.stop", "hciattach") < 0) { - LOGE("Error stopping hciattach"); + ALOGE("Error stopping hciattach"); goto out; } diff --git a/brcm_patchram_plus/brcm_patchram_plus.c b/brcm_patchram_plus/brcm_patchram_plus.c index 7316646..65a9b31 100644 --- a/brcm_patchram_plus/brcm_patchram_plus.c +++ b/brcm_patchram_plus/brcm_patchram_plus.c @@ -133,7 +133,7 @@ #define printf ALOGD #undef fprintf #define fprintf(x, ...) \ - { if(x==stderr) LOGE(__VA_ARGS__); else fprintf(x, __VA_ARGS__); } + { if(x==stderr) ALOGE(__VA_ARGS__); else fprintf(x, __VA_ARGS__); } #endif //ANDROID |