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

Commit c6762eb2 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Allow sensors list to be empty" into udc-dev am: 9895dfe4 

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



Change-Id: I36d4568e48c0d9e04f8e10d92cc84a8be431cedd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43870a10 9895dfe4

libs/sensor/SensorManager.cpp

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




        mSensors = mSensorServer->getSensorList(mOpPackageName);

        mSensors = mSensorServer->getSensorList(mOpPackageName);

        size_t count = mSensors.size();

        size_t count = mSensors.size();

        if (count == 0) {

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

            ALOGE("Failed to get Sensor list");

        // existing behavior and callers expect this.

            mSensorServer.clear();

            return UNKNOWN_ERROR;

        }

        mSensorList =

        mSensorList =

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

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

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

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