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

Commit 1590f1d7 authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Automerger Merge Worker
Browse files

Delete mController when eventHub device is going away am: 6c57b2f5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/20079756



Change-Id: I29e9f8f1cdd64fba1e2188df99efda6e601eed21
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 250b142b 6c57b2f5

services/inputflinger/reader/InputDevice.cpp

+4 −0
Original line number Diff line number Diff line
@@ -232,6 +232,10 @@ void InputDevice::addEventHubDevice(int32_t eventHubId, bool populateMappers) { 
}



void InputDevice::removeEventHubDevice(int32_t eventHubId) {

    if (mController != nullptr && mController->getEventHubId() == eventHubId) {

        // Delete mController, since the corresponding eventhub device is going away

        mController = nullptr;

    }

    mDevices.erase(eventHubId);

}

services/inputflinger/tests/InputReader_test.cpp

+15 −0
Original line number Diff line number Diff line
@@ -2936,6 +2936,21 @@ TEST_F(InputDeviceTest, Configure_UniqueId_CorrectlyMatches) { 
    ASSERT_EQ(DISPLAY_UNIQUE_ID, mDevice->getAssociatedDisplayUniqueId());

}



/**

 * This test reproduces a crash caused by a dangling reference that remains after device is added

 * and removed. The reference is accessed in InputDevice::dump(..);

 */

TEST_F(InputDeviceTest, DumpDoesNotCrash) {

    constexpr int32_t TEST_EVENTHUB_ID = 10;

    mFakeEventHub->addDevice(TEST_EVENTHUB_ID, "Test EventHub device", InputDeviceClass::BATTERY);



    InputDevice device(mReader->getContext(), 1 /*id*/, 2 /*generation*/, {} /*identifier*/);

    device.addEventHubDevice(TEST_EVENTHUB_ID, true /*populateMappers*/);

    device.removeEventHubDevice(TEST_EVENTHUB_ID);

    std::string dumpStr, eventHubDevStr;

    device.dump(dumpStr, eventHubDevStr);

}



// --- InputMapperTest ---



class InputMapperTest : public testing::Test {