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

Commit da979e9a authored by Mayank Garg's avatar Mayank Garg
Browse files

Rename the newly added maps variable to be more descriptive 

Bug: 338665345
Test: atest InputTests
Change-Id: I3760407b2e9a67aed30ba92b20307c08a1c074d4
parent 443ac02e

services/core/jni/com_android_server_input_InputManagerService.cpp

+4 −4
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ void NativeInputManager::getReaderConfiguration(InputReaderConfiguration* outCon 
    // Original data: [{'inputPort1': '1'}, {'inputPort2': '2'}]

    // Received data: ['inputPort1', '1', 'inputPort2', '2']

    // So we unpack accordingly here.

    outConfig->portAssociations.clear();

    outConfig->inputPortToDisplayPortAssociations.clear();

    jobjectArray portAssociations = jobjectArray(env->CallObjectMethod(mServiceObj,

            gServiceClassInfo.getInputPortAssociations));

    if (!checkAndClearExceptionFromCallback(env, "getInputPortAssociations") && portAssociations) {
@@ -619,16 +619,16 @@ void NativeInputManager::getReaderConfiguration(InputReaderConfiguration* outCon 
                    displayPortStr.c_str());

                continue;

            }

            outConfig->portAssociations.insert({inputPort, displayPort});

            outConfig->inputPortToDisplayPortAssociations.insert({inputPort, displayPort});

        }

        env->DeleteLocalRef(portAssociations);

    }



    outConfig->uniqueIdAssociationsByPort = readMapFromInterleavedJavaArray<

    outConfig->inputPortToDisplayUniqueIdAssociations = readMapFromInterleavedJavaArray<

            std::string>(gServiceClassInfo.getInputUniqueIdAssociationsByPort,

                         "getInputUniqueIdAssociationsByPort");



    outConfig->uniqueIdAssociationsByDescriptor = readMapFromInterleavedJavaArray<

    outConfig->inputDeviceDescriptorToDisplayUniqueIdAssociations = readMapFromInterleavedJavaArray<

            std::string>(gServiceClassInfo.getInputUniqueIdAssociationsByDescriptor,

                         "getInputUniqueIdAssociationsByDescriptor");