Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE

Browse Source 
See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: I8ceb2dba1b031a0fd68d15d146960d9ced62bbf3
This commit is contained in:
Steve Block
2012-01-09 18:35:44 +00:00
parent 5c17a820f9
commit ec193dec4d
14 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
services/input/InputReader.cpp
View File

@@ -331,7 +331,7 @@ void InputReader::processEventsLocked(const RawEvent* rawEvents, size_t count) {
handleConfigurationChangedLocked(rawEvent->when);
break;
default:
LOG_ASSERT(false); // can't happen
ALOG_ASSERT(false); // can't happen
break;
}
}
@@ -2148,7 +2148,7 @@ void CursorInputMapper::dumpParameters(String8& dump) {
dump.append(INDENT4 "Mode: navigation\n");
break;
default:
LOG_ASSERT(false);
ALOG_ASSERT(false);
}
dump.appendFormat(INDENT4 "OrientationAware: %s\n",
@@ -2605,7 +2605,7 @@ void TouchInputMapper::dumpParameters(String8& dump) {
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 @@ void TouchInputMapper::dumpCalibration(String8& dump) {
dump.append(INDENT4 "touch.size.calibration: area\n");
break;
default:
LOG_ASSERT(false);
ALOG_ASSERT(false);
}
if (mCalibration.haveSizeScale) {
@@ -3217,7 +3217,7 @@ void TouchInputMapper::dumpCalibration(String8& dump) {
dump.append(INDENT4 "touch.pressure.calibration: amplitude\n");
break;
default:
LOG_ASSERT(false);
ALOG_ASSERT(false);
}
if (mCalibration.havePressureScale) {
@@ -3237,7 +3237,7 @@ void TouchInputMapper::dumpCalibration(String8& dump) {
dump.append(INDENT4 "touch.orientation.calibration: vector\n");
break;
default:
LOG_ASSERT(false);
ALOG_ASSERT(false);
}
// Distance
@@ -3249,7 +3249,7 @@ void TouchInputMapper::dumpCalibration(String8& dump) {
dump.append(INDENT4 "touch.distance.calibration: scaled\n");
break;
default:
LOG_ASSERT(false);
ALOG_ASSERT(false);
}
if (mCalibration.haveDistanceScale) {
@@ -3643,7 +3643,7 @@ void TouchInputMapper::dispatchTouches(nsecs_t when, uint32_t policyFlags) {
// 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 @@ void TouchInputMapper::cookPointerData() {
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 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when,
// 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 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when,
//
// 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 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when,
"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 @@ bool TouchInputMapper::preparePointerGestures(nsecs_t when,
"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 @@ void TouchInputMapper::dispatchMotion(nsecs_t when, uint32_t policyFlags, uint32
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 @@ void TouchInputMapper::dispatchMotion(nsecs_t when, uint32_t policyFlags, uint32
action = AMOTION_EVENT_ACTION_UP;
} else {
// Can't happen.
LOG_ASSERT(false);
ALOG_ASSERT(false);
}
}