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

Commit e1b13a25 authored by Mayank Garg's avatar Mayank Garg Committed by Android (Google) Code Review
Browse files

Merge "Rename the newly added maps variable to be more descriptive" into main

parents de8b5d9a da979e9a

services/core/jni/com_android_server_input_InputManagerService.cpp

+4 −4
Original line number Diff line number Diff line
@@ -601,7 +601,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) {
@@ -618,16 +618,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");