Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 827d1acb authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Change debug logs to info 

These debug logs currently don't show up in the logcat. Change them to
INFO level so that they are useful.

This can be observed by enabling some of the input logs and checking
logcat.

Bug: 282236272
Test: logcatcolor -b all | grep -i input
Change-Id: Ied3af6edc3fb5e4c3cb773131eabd1851bc6f83e
parent 59aa2699

services/inputflinger/dispatcher/InputDispatcher.cpp

+17 −17
Original line number Original line Diff line number Diff line
@@ -3581,7 +3581,7 @@ void InputDispatcher::startDispatchCycleLocked(nsecs_t currentTime, 
                const KeyEntry& keyEntry = static_cast<const KeyEntry&>(eventEntry);

                const KeyEntry& keyEntry = static_cast<const KeyEntry&>(eventEntry);

                std::array<uint8_t, 32> hmac = getSignature(keyEntry, *dispatchEntry);

                std::array<uint8_t, 32> hmac = getSignature(keyEntry, *dispatchEntry);

                if (DEBUG_OUTBOUND_EVENT_DETAILS) {

                if (DEBUG_OUTBOUND_EVENT_DETAILS) {

                    LOG(DEBUG) << "Publishing " << *dispatchEntry << " to "

                    LOG(INFO) << "Publishing " << *dispatchEntry << " to "

                              << connection->getInputChannelName();

                              << connection->getInputChannelName();

                }

                }
@@ -3600,7 +3600,7 @@ void InputDispatcher::startDispatchCycleLocked(nsecs_t currentTime, 




            case EventEntry::Type::MOTION: {

            case EventEntry::Type::MOTION: {

                if (DEBUG_OUTBOUND_EVENT_DETAILS) {

                if (DEBUG_OUTBOUND_EVENT_DETAILS) {

                    LOG(DEBUG) << "Publishing " << *dispatchEntry << " to "

                    LOG(INFO) << "Publishing " << *dispatchEntry << " to "

                              << connection->getInputChannelName();

                              << connection->getInputChannelName();

                }

                }

                status = publishMotionEvent(*connection, *dispatchEntry);

                status = publishMotionEvent(*connection, *dispatchEntry);
@@ -3760,7 +3760,7 @@ void InputDispatcher::abortBrokenDispatchCycleLocked(nsecs_t currentTime, 
                                                     const std::shared_ptr<Connection>& connection,

                                                     const std::shared_ptr<Connection>& connection,

                                                     bool notify) {

                                                     bool notify) {

    if (DEBUG_DISPATCH_CYCLE) {

    if (DEBUG_DISPATCH_CYCLE) {

        LOG(DEBUG) << "channel '" << connection->getInputChannelName() << "'~ " << __func__

        LOG(INFO) << "channel '" << connection->getInputChannelName() << "'~ " << __func__

                  << " - notify=" << toString(notify);

                  << " - notify=" << toString(notify);

    }

    }
@@ -4538,7 +4538,7 @@ InputEventInjectionResult InputDispatcher::injectInputEvent(const InputEvent* ev 
    }

    }





    if (debugInboundEventDetails()) {

    if (debugInboundEventDetails()) {

        LOG(DEBUG) << __func__ << ": targetUid=" << toString(targetUid, &uidString)

        LOG(INFO) << __func__ << ": targetUid=" << toString(targetUid, &uidString)

                  << ", syncMode=" << ftl::enum_string(syncMode) << ", timeout=" << timeout.count()

                  << ", syncMode=" << ftl::enum_string(syncMode) << ", timeout=" << timeout.count()

                  << "ms, policyFlags=0x" << std::hex << policyFlags << std::dec

                  << "ms, policyFlags=0x" << std::hex << policyFlags << std::dec

                  << ", event=" << *event;

                  << ", event=" << *event;
@@ -4692,7 +4692,7 @@ InputEventInjectionResult InputDispatcher::injectInputEvent(const InputEvent* ev 
    bool needWake = false;

    bool needWake = false;

    while (!injectedEntries.empty()) {

    while (!injectedEntries.empty()) {

        if (DEBUG_INJECTION) {

        if (DEBUG_INJECTION) {

            LOG(DEBUG) << "Injecting " << injectedEntries.front()->getDescription();

            LOG(INFO) << "Injecting " << injectedEntries.front()->getDescription();

        }

        }

        needWake |= enqueueInboundEventLocked(std::move(injectedEntries.front()));

        needWake |= enqueueInboundEventLocked(std::move(injectedEntries.front()));

        injectedEntries.pop();

        injectedEntries.pop();
@@ -4756,7 +4756,7 @@ InputEventInjectionResult InputDispatcher::injectInputEvent(const InputEvent* ev 
    } // release lock

    } // release lock





    if (DEBUG_INJECTION) {

    if (DEBUG_INJECTION) {

        LOG(DEBUG) << "injectInputEvent - Finished with result "

        LOG(INFO) << "injectInputEvent - Finished with result "

                  << ftl::enum_string(injectionResult);

                  << ftl::enum_string(injectionResult);

    }

    }
@@ -4801,7 +4801,7 @@ void InputDispatcher::setInjectionResult(EventEntry& entry, 
    InjectionState* injectionState = entry.injectionState;

    InjectionState* injectionState = entry.injectionState;

    if (injectionState) {

    if (injectionState) {

        if (DEBUG_INJECTION) {

        if (DEBUG_INJECTION) {

            LOG(DEBUG) << "Setting input event injection result to "

            LOG(INFO) << "Setting input event injection result to "

                      << ftl::enum_string(injectionResult);

                      << ftl::enum_string(injectionResult);

        }

        }
@@ -5409,7 +5409,7 @@ bool InputDispatcher::transferTouchFocus(const sp<IBinder>& fromToken, const sp< 
        }

        }

        std::set<int32_t> deviceIds = touchedWindow->getTouchingDeviceIds();

        std::set<int32_t> deviceIds = touchedWindow->getTouchingDeviceIds();

        if (deviceIds.size() != 1) {

        if (deviceIds.size() != 1) {

            LOG(DEBUG) << "Can't transfer touch. Currently touching devices: " << dumpSet(deviceIds)

            LOG(INFO) << "Can't transfer touch. Currently touching devices: " << dumpSet(deviceIds)

                      << " for window: " << touchedWindow->dump();

                      << " for window: " << touchedWindow->dump();

            return false;

            return false;

        }

        }