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

Commit 41d2f807 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

inputflinger: 64 bit compile issues 

Change-Id: I73c37eb19b28d987ff13632a999e71d6c96cc3e0
parent 0a324615

services/inputflinger/InputDispatcher.cpp

+4 −4
Original line number Diff line number Diff line
@@ -3141,7 +3141,7 @@ void InputDispatcher::dumpDispatchStateLocked(String8& dump) { 
                dump.append(INDENT3 "Windows:\n");

                for (size_t i = 0; i < state.windows.size(); i++) {

                    const TouchedWindow& touchedWindow = state.windows[i];

                    dump.appendFormat(INDENT4 "%d: name='%s', pointerIds=0x%0x, targetFlags=0x%x\n",

                    dump.appendFormat(INDENT4 "%zu: name='%s', pointerIds=0x%0x, targetFlags=0x%x\n",

                            i, touchedWindow.windowHandle->getName().string(),

                            touchedWindow.pointerIds.value,

                            touchedWindow.targetFlags);
@@ -3160,7 +3160,7 @@ void InputDispatcher::dumpDispatchStateLocked(String8& dump) { 
            const sp<InputWindowHandle>& windowHandle = mWindowHandles.itemAt(i);

            const InputWindowInfo* windowInfo = windowHandle->getInfo();



            dump.appendFormat(INDENT2 "%d: name='%s', displayId=%d, "

            dump.appendFormat(INDENT2 "%zu: name='%s', displayId=%d, "

                    "paused=%s, hasFocus=%s, hasWallpaper=%s, "

                    "visible=%s, canReceiveKeys=%s, flags=0x%08x, type=0x%08x, layer=%d, "

                    "frame=[%d,%d][%d,%d], scale=%f, "
@@ -3190,7 +3190,7 @@ void InputDispatcher::dumpDispatchStateLocked(String8& dump) { 
        dump.append(INDENT "MonitoringChannels:\n");

        for (size_t i = 0; i < mMonitoringChannels.size(); i++) {

            const sp<InputChannel>& channel = mMonitoringChannels[i];

            dump.appendFormat(INDENT2 "%d: '%s'\n", i, channel->getName().string());

            dump.appendFormat(INDENT2 "%zu: '%s'\n", i, channel->getName().string());

        }

    } else {

        dump.append(INDENT "MonitoringChannels: <none>\n");
@@ -3239,7 +3239,7 @@ void InputDispatcher::dumpDispatchStateLocked(String8& dump) { 
        dump.append(INDENT "Connections:\n");

        for (size_t i = 0; i < mConnectionsByFd.size(); i++) {

            const sp<Connection>& connection = mConnectionsByFd.valueAt(i);

            dump.appendFormat(INDENT2 "%d: channelName='%s', windowName='%s', "

            dump.appendFormat(INDENT2 "%zu: channelName='%s', windowName='%s', "

                    "status=%s, monitor=%s, inputPublisherBlocked=%s\n",

                    i, connection->getInputChannelName(), connection->getWindowName(),

                    connection->getStatusLabel(), toString(connection->monitor),

services/inputflinger/InputReader.cpp

+4 −4
Original line number Diff line number Diff line
@@ -2003,9 +2003,9 @@ void KeyboardInputMapper::dump(String8& dump) { 
    dumpParameters(dump);

    dump.appendFormat(INDENT3 "KeyboardType: %d\n", mKeyboardType);

    dump.appendFormat(INDENT3 "Orientation: %d\n", mOrientation);

    dump.appendFormat(INDENT3 "KeyDowns: %d keys currently down\n", mKeyDowns.size());

    dump.appendFormat(INDENT3 "KeyDowns: %zu keys currently down\n", mKeyDowns.size());

    dump.appendFormat(INDENT3 "MetaState: 0x%0x\n", mMetaState);

    dump.appendFormat(INDENT3 "DownTime: %lld\n", mDownTime);

    dump.appendFormat(INDENT3 "DownTime: %lld\n", (long long)mDownTime);

}
@@ -2303,7 +2303,7 @@ void CursorInputMapper::dump(String8& dump) { 
    dump.appendFormat(INDENT3 "Orientation: %d\n", mOrientation);

    dump.appendFormat(INDENT3 "ButtonState: 0x%08x\n", mButtonState);

    dump.appendFormat(INDENT3 "Down: %s\n", toString(isPointerDown(mButtonState)));

    dump.appendFormat(INDENT3 "DownTime: %lld\n", mDownTime);

    dump.appendFormat(INDENT3 "DownTime: %lld\n", (long long)mDownTime);

}



void CursorInputMapper::configure(nsecs_t when,
@@ -3409,7 +3409,7 @@ void TouchInputMapper::dumpVirtualKeys(String8& dump) { 


        for (size_t i = 0; i < mVirtualKeys.size(); i++) {

            const VirtualKey& virtualKey = mVirtualKeys.itemAt(i);

            dump.appendFormat(INDENT4 "%d: scanCode=%d, keyCode=%d, "

            dump.appendFormat(INDENT4 "%zu: scanCode=%d, keyCode=%d, "

                    "hitLeft=%d, hitRight=%d, hitTop=%d, hitBottom=%d\n",

                    i, virtualKey.scanCode, virtualKey.keyCode,

                    virtualKey.hitLeft, virtualKey.hitRight,

services/inputflinger/main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


using namespace android;



int main(int argc, char** argv) {

int main(int, char**) {

    ProcessState::self()->setThreadPoolMaxThreadCount(4);

    BinderService<InputFlinger>::publishAndJoinThreadPool(true);

    return 0;