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

Commit 02c0482d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow sensors list to be empty" into main am: 099be40e 

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



Change-Id: Ie738a9fc5e5b45608260be8bfac98967692729c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ca9fc2e8 099be40e

libs/sensor/SensorManager.cpp

+2 −5
Original line number Diff line number Diff line
@@ -176,11 +176,8 @@ status_t SensorManager::assertStateLocked() { 


        mSensors = mSensorServer->getSensorList(mOpPackageName);

        size_t count = mSensors.size();

        if (count == 0) {

            ALOGE("Failed to get Sensor list");

            mSensorServer.clear();

            return UNKNOWN_ERROR;

        }

        // If count is 0, mSensorList will be non-null. This is old

        // existing behavior and callers expect this.

        mSensorList =

                static_cast<Sensor const**>(malloc(count * sizeof(Sensor*)));

        LOG_ALWAYS_FATAL_IF(mSensorList == nullptr, "mSensorList NULL");