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

Commit f88479a2 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Automerger Merge Worker
Browse files

Merge "Fix use after delete reference for device" into udc-dev am: c4f356dd am: 78c1cb7c 

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



Change-Id: I4442b6ed13691745f787b2c863cd3836dd017d3b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c346287 78c1cb7c

services/inputflinger/tests/FakeEventHub.cpp

+4 −2
Original line number Diff line number Diff line
@@ -617,9 +617,11 @@ void FakeEventHub::sysfsNodeChanged(const std::string& sysfsNodePath) { 
    }

    // If device sysfs changed -> reopen the device

    if (!mRawLightInfos.empty() && !foundDevice->classes.test(InputDeviceClass::LIGHT)) {

        InputDeviceIdentifier identifier = foundDevice->identifier;

        ftl::Flags<InputDeviceClass> classes = foundDevice->classes;

        removeDevice(foundDeviceId);

        addDevice(foundDeviceId, foundDevice->identifier.name,

                  foundDevice->classes | InputDeviceClass::LIGHT, foundDevice->identifier.bus);

        addDevice(foundDeviceId, identifier.name, classes | InputDeviceClass::LIGHT,

                  identifier.bus);

    }

}