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

Commit 49971061 authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk Committed by Automerger Merge Worker
Browse files

Merge "Migrate String8|16.setTo to assignment operator [sensors]" into... 

Merge "Migrate String8|16.setTo to assignment operator [sensors]" into udc-dev-plus-aosp am: 3b906b0d am: 66b2479d

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



Change-Id: I2ee6476e16d54a3183b28d3d52b9761ae816e92d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ffe1475 66b2479d

libs/sensor/Sensor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ bool Sensor::unflattenString8(void const*& buffer, size_t& size, String8& output 
    if (size < len) {

        return false;

    }

    outputString8.setTo(static_cast<char const*>(buffer), len);

    outputString8 = String8(static_cast<char const*>(buffer), len);



    if (size < FlattenableUtils::align<4>(len)) {

        ALOGE("Malformed Sensor String8 field. Should be in a 4-byte aligned buffer but is not.");

services/sensorservice/SensorService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2336,7 +2336,7 @@ status_t SensorService::changeOperatingMode(const Vector<String16>& args, 
        mCurrentOperatingMode = RESTRICTED;

        // temporarily stop all sensor direct report and disable sensors

        disableAllSensorsLocked(&connLock);

        mAllowListedPackage.setTo(String8(args[1]));

        mAllowListedPackage = String8(args[1]);

        return status_t(NO_ERROR);

      case REPLAY_DATA_INJECTION:

        if (SensorServiceUtil::isUserBuild()) {
@@ -2356,7 +2356,7 @@ status_t SensorService::changeOperatingMode(const Vector<String16>& args, 
                // Re-enable sensors.

                dev.enableAllSensors();

            }

            mAllowListedPackage.setTo(String8(args[1]));

            mAllowListedPackage = String8(args[1]);

            return NO_ERROR;

        } else {

            // Transition to data injection mode supported only from NORMAL mode.