Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
See https://android-git.corp.google.com/g/157519
Bug: 5449033
Change-Id: I8ceb2dba1b031a0fd68d15d146960d9ced62bbf3
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 72525cd..4ddefdb 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -2127,7 +2127,7 @@
// the minimum track buffer size is normally twice the number of frames necessary
// to fill one buffer and the resampler should not leave more than one buffer worth
// of unreleased frames after each pass, but just in case...
- LOG_ASSERT(minFrames <= cblk->frameCount);
+ ALOG_ASSERT(minFrames <= cblk->frameCount);
}
}
if ((cblk->framesReady() >= minFrames) && track->isReady() &&
diff --git a/services/audioflinger/AudioResampler.cpp b/services/audioflinger/AudioResampler.cpp
index fbdcb62..feacd96 100644
--- a/services/audioflinger/AudioResampler.cpp
+++ b/services/audioflinger/AudioResampler.cpp
@@ -123,7 +123,7 @@
if ((bitDepth != 16) ||(inChannelCount < 1) || (inChannelCount > 2)) {
ALOGE("Unsupported sample format, %d bits, %d channels", bitDepth,
inChannelCount);
- // LOG_ASSERT(0);
+ // ALOG_ASSERT(0);
}
// initialize common members
@@ -164,7 +164,7 @@
AudioBufferProvider* provider) {
// should never happen, but we overflow if it does
- // LOG_ASSERT(outFrameCount < 32767);
+ // ALOG_ASSERT(outFrameCount < 32767);
// select the appropriate resampler
switch (mChannelCount) {
@@ -261,7 +261,7 @@
provider->releaseBuffer(&mBuffer);
// verify that the releaseBuffer resets the buffer frameCount
- // LOG_ASSERT(mBuffer.frameCount == 0);
+ // ALOG_ASSERT(mBuffer.frameCount == 0);
}
}
@@ -355,7 +355,7 @@
provider->releaseBuffer(&mBuffer);
// verify that the releaseBuffer resets the buffer frameCount
- // LOG_ASSERT(mBuffer.frameCount == 0);
+ // ALOG_ASSERT(mBuffer.frameCount == 0);
}
}
diff --git a/services/audioflinger/AudioResamplerCubic.cpp b/services/audioflinger/AudioResamplerCubic.cpp
index 587c7be..47205ba 100644
--- a/services/audioflinger/AudioResamplerCubic.cpp
+++ b/services/audioflinger/AudioResamplerCubic.cpp
@@ -36,7 +36,7 @@
AudioBufferProvider* provider) {
// should never happen, but we overflow if it does
- // LOG_ASSERT(outFrameCount < 32767);
+ // ALOG_ASSERT(outFrameCount < 32767);
// select the appropriate resampler
switch (mChannelCount) {
diff --git a/services/input/EventHub.cpp b/services/input/EventHub.cpp
index 6db750ee..68bbb570 100644
--- a/services/input/EventHub.cpp
+++ b/services/input/EventHub.cpp
@@ -535,7 +535,7 @@
}
size_t EventHub::getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSize) {
- LOG_ASSERT(bufferSize >= 1);
+ ALOG_ASSERT(bufferSize >= 1);
AutoMutex _l(mLock);
diff --git a/services/input/InputDispatcher.cpp b/services/input/InputDispatcher.cpp
index f2994ab..a0f372a 100644
--- a/services/input/InputDispatcher.cpp
+++ b/services/input/InputDispatcher.cpp
@@ -376,7 +376,7 @@
// Now we have an event to dispatch.
// All events are eventually dequeued and processed this way, even if we intend to drop them.
- LOG_ASSERT(mPendingEvent != NULL);
+ ALOG_ASSERT(mPendingEvent != NULL);
bool done = false;
DropReason dropReason = DROP_REASON_NOT_DROPPED;
if (!(mPendingEvent->policyFlags & POLICY_FLAG_PASS_TO_USER)) {
@@ -445,7 +445,7 @@
}
default:
- LOG_ASSERT(false);
+ ALOG_ASSERT(false);
break;
}
@@ -582,7 +582,7 @@
reason = "inbound event was dropped because it is stale";
break;
default:
- LOG_ASSERT(false);
+ ALOG_ASSERT(false);
return;
}
@@ -1017,7 +1017,7 @@
toString(resumeWithAppendedMotionSample));
#endif
- LOG_ASSERT(eventEntry->dispatchInProgress); // should already have been set to true
+ ALOG_ASSERT(eventEntry->dispatchInProgress); // should already have been set to true
pokeUserActivityLocked(eventEntry);
@@ -1878,7 +1878,7 @@
// Make sure we are never called for streaming when splitting across multiple windows.
bool isSplit = inputTarget->flags & InputTarget::FLAG_SPLIT;
- LOG_ASSERT(! (resumeWithAppendedMotionSample && isSplit));
+ ALOG_ASSERT(! (resumeWithAppendedMotionSample && isSplit));
// Skip this event if the connection status is not normal.
// We don't want to enqueue additional outbound events if the connection is broken.
@@ -1892,7 +1892,7 @@
// Split a motion event if needed.
if (isSplit) {
- LOG_ASSERT(eventEntry->type == EventEntry::TYPE_MOTION);
+ ALOG_ASSERT(eventEntry->type == EventEntry::TYPE_MOTION);
MotionEntry* originalMotionEntry = static_cast<MotionEntry*>(eventEntry);
if (inputTarget->pointerIds.count() != originalMotionEntry->pointerCount) {
@@ -2135,11 +2135,11 @@
connection->getInputChannelName());
#endif
- LOG_ASSERT(connection->status == Connection::STATUS_NORMAL);
- LOG_ASSERT(! connection->outboundQueue.isEmpty());
+ ALOG_ASSERT(connection->status == Connection::STATUS_NORMAL);
+ ALOG_ASSERT(! connection->outboundQueue.isEmpty());
DispatchEntry* dispatchEntry = connection->outboundQueue.head;
- LOG_ASSERT(! dispatchEntry->inProgress);
+ ALOG_ASSERT(! dispatchEntry->inProgress);
// Mark the dispatch entry as in progress.
dispatchEntry->inProgress = true;
@@ -2271,7 +2271,7 @@
}
default: {
- LOG_ASSERT(false);
+ ALOG_ASSERT(false);
}
}
@@ -2518,7 +2518,7 @@
InputDispatcher::MotionEntry*
InputDispatcher::splitMotionEvent(const MotionEntry* originalMotionEntry, BitSet32 pointerIds) {
- LOG_ASSERT(pointerIds.value != 0);
+ ALOG_ASSERT(pointerIds.value != 0);
uint32_t splitPointerIndexMap[MAX_POINTERS];
PointerProperties splitPointerProperties[MAX_POINTERS];
@@ -3936,7 +3936,7 @@
return true; // skip next cycle
}
- LOG_ASSERT(connection->outboundQueue.head == dispatchEntry);
+ ALOG_ASSERT(connection->outboundQueue.head == dispatchEntry);
// Latch the fallback keycode for this key on an initial down.
// The fallback keycode cannot change at any other point in the lifecycle.
@@ -3949,7 +3949,7 @@
connection->inputState.setFallbackKey(originalKeyCode, fallbackKeyCode);
}
- LOG_ASSERT(fallbackKeyCode != -1);
+ ALOG_ASSERT(fallbackKeyCode != -1);
// Cancel the fallback key if the policy decides not to send it anymore.
// We will continue to dispatch the key to the policy but we will no
@@ -4101,7 +4101,7 @@
if (refCount == 0) {
delete this;
} else {
- LOG_ASSERT(refCount > 0);
+ ALOG_ASSERT(refCount > 0);
}
}
@@ -4122,7 +4122,7 @@
if (refCount == 0) {
delete this;
} else {
- LOG_ASSERT(refCount > 0);
+ ALOG_ASSERT(refCount > 0);
}
}
diff --git a/services/input/InputReader.cpp b/services/input/InputReader.cpp
index bc17272..fa0b3d8 100644
--- a/services/input/InputReader.cpp
+++ b/services/input/InputReader.cpp
@@ -331,7 +331,7 @@
handleConfigurationChangedLocked(rawEvent->when);
break;
default:
- LOG_ASSERT(false); // can't happen
+ ALOG_ASSERT(false); // can't happen
break;
}
}
@@ -2148,7 +2148,7 @@
dump.append(INDENT4 "Mode: navigation\n");
break;
default:
- LOG_ASSERT(false);
+ ALOG_ASSERT(false);
}
dump.appendFormat(INDENT4 "OrientationAware: %s\n",
@@ -2605,7 +2605,7 @@
dump.append(INDENT4 "DeviceType: pointer\n");
break;
default:
- LOG_ASSERT(false);
+ ALOG_ASSERT(false);
}
dump.appendFormat(INDENT4 "AssociatedDisplay: id=%d, isExternal=%s\n",
@@ -3187,7 +3187,7 @@
dump.append(INDENT4 "touch.size.calibration: area\n");
break;
default:
- LOG_ASSERT(false);
+ ALOG_ASSERT(false);
}
if (mCalibration.haveSizeScale) {
@@ -3217,7 +3217,7 @@
dump.append(INDENT4 "touch.pressure.calibration: amplitude\n");
break;
default:
- LOG_ASSERT(false);
+ ALOG_ASSERT(false);
}
if (mCalibration.havePressureScale) {
@@ -3237,7 +3237,7 @@
dump.append(INDENT4 "touch.orientation.calibration: vector\n");
break;
default:
- LOG_ASSERT(false);
+ ALOG_ASSERT(false);
}
// Distance
@@ -3249,7 +3249,7 @@
dump.append(INDENT4 "touch.distance.calibration: scaled\n");
break;
default:
- LOG_ASSERT(false);
+ ALOG_ASSERT(false);
}
if (mCalibration.haveDistanceScale) {
@@ -3643,7 +3643,7 @@
// Although applications receive new locations as part of individual pointer up
// events, they do not generally handle them except when presented in a move event.
if (moveNeeded) {
- LOG_ASSERT(moveIdBits.value == dispatchedIdBits.value);
+ ALOG_ASSERT(moveIdBits.value == dispatchedIdBits.value);
dispatchMotion(when, policyFlags, mSource,
AMOTION_EVENT_ACTION_MOVE, 0, metaState, buttonState, 0,
mCurrentCookedPointerData.pointerProperties,
@@ -3754,7 +3754,7 @@
size = mRawPointerAxes.toolMinor.valid
? avg(in.toolMajor, in.toolMinor) : in.toolMajor;
} else {
- LOG_ASSERT(false, "No touch or tool axes. "
+ ALOG_ASSERT(false, "No touch or tool axes. "
"Size calibration should have been resolved to NONE.");
touchMajor = 0;
touchMinor = 0;
@@ -4473,7 +4473,7 @@
// The pointer follows the active touch point.
// When in HOVER, emit HOVER_MOVE events at the pointer location.
// When in TAP_DRAG, emit MOVE events at the pointer location.
- LOG_ASSERT(activeTouchId >= 0);
+ ALOG_ASSERT(activeTouchId >= 0);
mPointerGesture.currentGestureMode = PointerGesture::HOVER;
if (mPointerGesture.lastGestureMode == PointerGesture::TAP) {
@@ -4573,7 +4573,7 @@
//
// When the two fingers move enough or when additional fingers are added, we make
// a decision to transition into SWIPE or FREEFORM mode accordingly.
- LOG_ASSERT(activeTouchId >= 0);
+ ALOG_ASSERT(activeTouchId >= 0);
bool settled = when >= mPointerGesture.firstTouchTime
+ mConfig.pointerGestureMultitouchSettleInterval;
@@ -4782,7 +4782,7 @@
"activeGestureId=%d, currentTouchPointerCount=%d",
activeTouchId, mPointerGesture.activeGestureId, currentFingerCount);
#endif
- LOG_ASSERT(mPointerGesture.activeGestureId >= 0);
+ ALOG_ASSERT(mPointerGesture.activeGestureId >= 0);
mPointerGesture.currentGestureIdBits.clear();
mPointerGesture.currentGestureIdBits.markBit(mPointerGesture.activeGestureId);
@@ -4804,7 +4804,7 @@
"activeGestureId=%d, currentTouchPointerCount=%d",
activeTouchId, mPointerGesture.activeGestureId, currentFingerCount);
#endif
- LOG_ASSERT(mPointerGesture.activeGestureId >= 0);
+ ALOG_ASSERT(mPointerGesture.activeGestureId >= 0);
mPointerGesture.currentGestureIdBits.clear();
@@ -5172,7 +5172,7 @@
pointerCount += 1;
}
- LOG_ASSERT(pointerCount != 0);
+ ALOG_ASSERT(pointerCount != 0);
if (changedId >= 0 && pointerCount == 1) {
// Replace initial down and final up action.
@@ -5184,7 +5184,7 @@
action = AMOTION_EVENT_ACTION_UP;
} else {
// Can't happen.
- LOG_ASSERT(false);
+ ALOG_ASSERT(false);
}
}
diff --git a/services/jni/onload.cpp b/services/jni/onload.cpp
index 286ae91..c7beb5f 100644
--- a/services/jni/onload.cpp
+++ b/services/jni/onload.cpp
@@ -46,7 +46,7 @@
ALOGE("GetEnv failed!");
return result;
}
- LOG_ASSERT(env, "Could not retrieve the env!");
+ ALOG_ASSERT(env, "Could not retrieve the env!");
register_android_server_PowerManagerService(env);
register_android_server_InputApplicationHandle(env);