Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp
index 19c01a1..46a5cc6 100644
--- a/services/input/InputDispatcher.cpp
+++ b/services/input/InputDispatcher.cpp
@@ -121,7 +121,7 @@
static bool validateKeyEvent(int32_t action) {
if (! isValidKeyAction(action)) {
- LOGE("Key event has invalid action code 0x%x", action);
+ ALOGE("Key event has invalid action code 0x%x", action);
return false;
}
return true;
@@ -152,11 +152,11 @@
static bool validateMotionEvent(int32_t action, size_t pointerCount,
const PointerProperties* pointerProperties) {
if (! isValidMotionAction(action, pointerCount)) {
- LOGE("Motion event has invalid action code 0x%x", action);
+ ALOGE("Motion event has invalid action code 0x%x", action);
return false;
}
if (pointerCount < 1 || pointerCount > MAX_POINTERS) {
- LOGE("Motion event has invalid pointer count %d; value must be between 1 and %d.",
+ ALOGE("Motion event has invalid pointer count %d; value must be between 1 and %d.",
pointerCount, MAX_POINTERS);
return false;
}
@@ -164,12 +164,12 @@
for (size_t i = 0; i < pointerCount; i++) {
int32_t id = pointerProperties[i].id;
if (id < 0 || id > MAX_POINTER_ID) {
- LOGE("Motion event has invalid pointer id %d; value must be between 0 and %d",
+ ALOGE("Motion event has invalid pointer id %d; value must be between 0 and %d",
id, MAX_POINTER_ID);
return false;
}
if (pointerIdBits.hasBit(id)) {
- LOGE("Motion event has duplicate pointer id %d", id);
+ ALOGE("Motion event has duplicate pointer id %d", id);
return false;
}
pointerIdBits.markBit(id);
@@ -2168,7 +2168,7 @@
keyEntry->eventTime);
if (status) {
- LOGE("channel '%s' ~ Could not publish key event, "
+ ALOGE("channel '%s' ~ Could not publish key event, "
"status=%d", connection->getInputChannelName(), status);
abortBrokenDispatchCycleLocked(currentTime, connection, true /*notify*/);
return;
@@ -2231,7 +2231,7 @@
usingCoords);
if (status) {
- LOGE("channel '%s' ~ Could not publish motion event, "
+ ALOGE("channel '%s' ~ Could not publish motion event, "
"status=%d", connection->getInputChannelName(), status);
abortBrokenDispatchCycleLocked(currentTime, connection, true /*notify*/);
return;
@@ -2263,7 +2263,7 @@
break;
}
if (status != OK) {
- LOGE("channel '%s' ~ Could not append motion sample "
+ ALOGE("channel '%s' ~ Could not append motion sample "
"for a reason other than out of memory, status=%d",
connection->getInputChannelName(), status);
abortBrokenDispatchCycleLocked(currentTime, connection, true /*notify*/);
@@ -2286,7 +2286,7 @@
// Send the dispatch signal.
status = connection->inputPublisher.sendDispatchSignal();
if (status) {
- LOGE("channel '%s' ~ Could not send dispatch signal, status=%d",
+ ALOGE("channel '%s' ~ Could not send dispatch signal, status=%d",
connection->getInputChannelName(), status);
abortBrokenDispatchCycleLocked(currentTime, connection, true /*notify*/);
return;
@@ -2321,7 +2321,7 @@
// while waiting for the next dispatch cycle to begin.
status_t status = connection->inputPublisher.reset();
if (status) {
- LOGE("channel '%s' ~ Could not reset publisher, status=%d",
+ ALOGE("channel '%s' ~ Could not reset publisher, status=%d",
connection->getInputChannelName(), status);
abortBrokenDispatchCycleLocked(currentTime, connection, true /*notify*/);
return;
@@ -2408,7 +2408,7 @@
ssize_t connectionIndex = d->mConnectionsByReceiveFd.indexOfKey(receiveFd);
if (connectionIndex < 0) {
- LOGE("Received spurious receive callback for unknown input channel. "
+ ALOGE("Received spurious receive callback for unknown input channel. "
"fd=%d, events=0x%x", receiveFd, events);
return 0; // remove the callback
}
@@ -2431,7 +2431,7 @@
return 1;
}
- LOGE("channel '%s' ~ Failed to receive finished signal. status=%d",
+ ALOGE("channel '%s' ~ Failed to receive finished signal. status=%d",
connection->getInputChannelName(), status);
notify = true;
} else {
@@ -3651,7 +3651,7 @@
sp<Connection> connection = new Connection(inputChannel, inputWindowHandle, monitor);
status_t status = connection->initialize();
if (status) {
- LOGE("Failed to initialize input publisher for input channel '%s', status=%d",
+ ALOGE("Failed to initialize input publisher for input channel '%s', status=%d",
inputChannel->getName().string(), status);
return status;
}
@@ -3770,7 +3770,7 @@
void InputDispatcher::onDispatchCycleBrokenLocked(
nsecs_t currentTime, const sp<Connection>& connection) {
- LOGE("channel '%s' ~ Channel is unrecoverably broken and will be disposed!",
+ ALOGE("channel '%s' ~ Channel is unrecoverably broken and will be disposed!",
connection->getInputChannelName());
CommandEntry* commandEntry = postCommandLocked(