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

Commit caa66e34 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 

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



Change-Id: I648232afcb30aee7ca16bd3e5e9b88efe47739c2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b9d97b76 c4f356dd

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

    }

}