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

Commit 33d33746 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "libservices.core: Fix unused variable warnings" into main

parents 2ef21e4c 46a217bf

services/core/jni/com_android_server_UsbDeviceManager.cpp

+0 −2
Original line number Diff line number Diff line
@@ -665,8 +665,6 @@ class NativeVendorControlRequestMonitorThread { 
    }



    void handleControlRequest(int fd, const struct usb_ctrlrequest *setup) {

        JNIEnv *env = AndroidRuntime::getJNIEnv();



        uint8_t type = setup->bRequestType;

        uint8_t code = setup->bRequest;

        uint16_t length = setup->wLength;

services/core/jni/com_android_server_input_InputManagerService.cpp

+0 −3
Original line number Diff line number Diff line
@@ -601,9 +601,6 @@ void NativeInputManager::dump(std::string& dump) { 
    dump += "Input Manager State:\n";

    { // acquire lock

        std::scoped_lock _l(mLock);

        auto logicalDisplayIdToString = [](const ui::LogicalDisplayId& displayId) {

            return std::to_string(displayId.val());

        };

        dump += StringPrintf(INDENT "Display not interactive: %s\n",

                             dumpContainer(mLocked.nonInteractiveDisplays, streamableToString)

                                     .c_str());

services/core/jni/com_android_server_utils_AnrTimer.cpp

+0 −7
Original line number Diff line number Diff line
@@ -90,9 +90,6 @@ int timer_settime(int fd, int flags, const struct itimerspec *new_value, 
// unit test image to debug test failures.

const bool DEBUG_TIMER = false;



// A local debug flag to debug the timer thread itself.

const bool DEBUG_TICKER = false;



// Enable error logging.

const bool DEBUG_ERROR = true;
@@ -515,7 +512,6 @@ public: 
    // this method may overwrite that action.

    std::pair<bool, std::string> setTracedAction(std::string config) {

        const char* s = config.c_str();

        const char* word = nullptr;

        unsigned int percent = 0;

        if (sscanf(s, "expire=%d", &percent) == 1) {

            if (percent < 0 || percent > 100) {
@@ -1093,7 +1089,6 @@ class AnrTimerService::Timer { 
            traceEvent(msg);

        }

        if (verbose) {

            char name[PATH_MAX];

            ALOGI_IF(DEBUG_TIMER, "event %s %s name=%s",

                     tag, toString().c_str(), getName().c_str());

        } else {
@@ -1178,7 +1173,6 @@ class AnrTimerService::Ticker { 
    void remove(nsecs_t scheduled, timer_id_t id) {

        Entry key(scheduled, id, 0);

        AutoMutex _l(lock_);

        timer_id_t front = headTimerId();

        auto found = running_.find(key);

        if (found != running_.end()) running_.erase(found);

        if (running_.empty()) drained_++;
@@ -1187,7 +1181,6 @@ class AnrTimerService::Ticker { 
    // Remove every timer associated with the service.

    void remove(const AnrTimerService* service) {

        AutoMutex _l(lock_);

        timer_id_t front = headTimerId();

        for (auto i = running_.begin(); i != running_.end(); ) {

            if (i->service == service) {

                i = running_.erase(i);