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

Commit d2731ff9 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... 

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

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



Change-Id: I850370e40324547259108b57686853cbde6432ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3836725f a85036a2

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);

    }

}