diff options
Diffstat (limited to 'services/input/InputReader.cpp')
| -rw-r--r-- | services/input/InputReader.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/services/input/InputReader.cpp b/services/input/InputReader.cpp index bf398f7..e8802f5 100644 --- a/services/input/InputReader.cpp +++ b/services/input/InputReader.cpp @@ -359,7 +359,7 @@ void InputReader::addDeviceLocked(nsecs_t when, int32_t deviceId) { if (deviceIndex < 0) { mDevices.add(deviceId, device); } else { - LOGW("Ignoring spurious device added event for deviceId %d.", deviceId); + ALOGW("Ignoring spurious device added event for deviceId %d.", deviceId); delete device; return; } @@ -372,7 +372,7 @@ void InputReader::removeDeviceLocked(nsecs_t when, int32_t deviceId) { device = mDevices.valueAt(deviceIndex); mDevices.removeItemsAt(deviceIndex, 1); } else { - LOGW("Ignoring spurious device removed event for deviceId %d.", deviceId); + ALOGW("Ignoring spurious device removed event for deviceId %d.", deviceId); return; } @@ -446,7 +446,7 @@ void InputReader::processEventsForDeviceLocked(int32_t deviceId, const RawEvent* rawEvents, size_t count) { ssize_t deviceIndex = mDevices.indexOfKey(deviceId); if (deviceIndex < 0) { - LOGW("Discarding event for unknown deviceId %d.", deviceId); + ALOGW("Discarding event for unknown deviceId %d.", deviceId); return; } @@ -1546,7 +1546,7 @@ void MultiTouchMotionAccumulator::process(const RawEvent* rawEvent) { if (mCurrentSlot < 0 || size_t(mCurrentSlot) >= mSlotCount) { #if DEBUG_POINTERS if (newSlot) { - LOGW("MultiTouch device emitted invalid slot index %d but it " + ALOGW("MultiTouch device emitted invalid slot index %d but it " "should be between 0 and %d; ignoring this slot.", mCurrentSlot, mSlotCount - 1); } @@ -2113,7 +2113,7 @@ void CursorInputMapper::configureParameters() { if (cursorModeString == "navigation") { mParameters.mode = Parameters::MODE_NAVIGATION; } else if (cursorModeString != "pointer" && cursorModeString != "default") { - LOGW("Invalid value for cursor.mode: '%s'", cursorModeString.string()); + ALOGW("Invalid value for cursor.mode: '%s'", cursorModeString.string()); } } @@ -2522,7 +2522,7 @@ void TouchInputMapper::configureParameters() { } else if (gestureModeString == "spots") { mParameters.gestureMode = Parameters::GESTURE_MODE_SPOTS; } else if (gestureModeString != "default") { - LOGW("Invalid value for touch.gestureMode: '%s'", gestureModeString.string()); + ALOGW("Invalid value for touch.gestureMode: '%s'", gestureModeString.string()); } } @@ -2552,7 +2552,7 @@ void TouchInputMapper::configureParameters() { } else if (deviceTypeString == "pointer") { mParameters.deviceType = Parameters::DEVICE_TYPE_POINTER; } else if (deviceTypeString != "default") { - LOGW("Invalid value for touch.deviceType: '%s'", deviceTypeString.string()); + ALOGW("Invalid value for touch.deviceType: '%s'", deviceTypeString.string()); } } @@ -2646,7 +2646,7 @@ void TouchInputMapper::configureSurface(nsecs_t when, bool* outResetNeeded) { // Ensure we have valid X and Y axes. if (!mRawPointerAxes.x.valid || !mRawPointerAxes.y.valid) { - LOGW(INDENT "Touch device '%s' did not report support for X or Y axis! " + ALOGW(INDENT "Touch device '%s' did not report support for X or Y axis! " "The device will be inoperable.", getDeviceName().string()); mDeviceMode = DEVICE_MODE_DISABLED; return; @@ -3002,7 +3002,7 @@ void TouchInputMapper::configureVirtualKeys() { uint32_t flags; if (getEventHub()->mapKey(getDeviceId(), virtualKey.scanCode, & keyCode, & flags)) { - LOGW(INDENT "VirtualKey %d: could not obtain key code, ignoring", + ALOGW(INDENT "VirtualKey %d: could not obtain key code, ignoring", virtualKey.scanCode); mVirtualKeys.pop(); // drop the key continue; @@ -3058,7 +3058,7 @@ void TouchInputMapper::parseCalibration() { } else if (sizeCalibrationString == "area") { out.sizeCalibration = Calibration::SIZE_CALIBRATION_AREA; } else if (sizeCalibrationString != "default") { - LOGW("Invalid value for touch.size.calibration: '%s'", + ALOGW("Invalid value for touch.size.calibration: '%s'", sizeCalibrationString.string()); } } @@ -3081,7 +3081,7 @@ void TouchInputMapper::parseCalibration() { } else if (pressureCalibrationString == "amplitude") { out.pressureCalibration = Calibration::PRESSURE_CALIBRATION_AMPLITUDE; } else if (pressureCalibrationString != "default") { - LOGW("Invalid value for touch.pressure.calibration: '%s'", + ALOGW("Invalid value for touch.pressure.calibration: '%s'", pressureCalibrationString.string()); } } @@ -3100,7 +3100,7 @@ void TouchInputMapper::parseCalibration() { } else if (orientationCalibrationString == "vector") { out.orientationCalibration = Calibration::ORIENTATION_CALIBRATION_VECTOR; } else if (orientationCalibrationString != "default") { - LOGW("Invalid value for touch.orientation.calibration: '%s'", + ALOGW("Invalid value for touch.orientation.calibration: '%s'", orientationCalibrationString.string()); } } @@ -3114,7 +3114,7 @@ void TouchInputMapper::parseCalibration() { } else if (distanceCalibrationString == "scaled") { out.distanceCalibration = Calibration::DISTANCE_CALIBRATION_SCALED; } else if (distanceCalibrationString != "default") { - LOGW("Invalid value for touch.distance.calibration: '%s'", + ALOGW("Invalid value for touch.distance.calibration: '%s'", distanceCalibrationString.string()); } } @@ -5678,7 +5678,7 @@ void MultiTouchInputMapper::configureRawPointerAxes() { && mRawPointerAxes.slot.minValue == 0 && mRawPointerAxes.slot.maxValue > 0) { size_t slotCount = mRawPointerAxes.slot.maxValue + 1; if (slotCount > MAX_SLOTS) { - LOGW("MultiTouch Device %s reported %d slots but the framework " + ALOGW("MultiTouch Device %s reported %d slots but the framework " "only supports a maximum of %d slots at this time.", getDeviceName().string(), slotCount, MAX_SLOTS); slotCount = MAX_SLOTS; |