From 596b44b894b19dbff23fce6c4db1c32796a2cdb5 Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Thu, 24 Aug 2023 16:57:29 +0000 Subject: Migrate String8|16.setTo to assignment operator [sensors] Bug: 295394788 Test: make checkbuild Change-Id: I63b97b573f6b182ba36c4eb933b695d7a6ed59d0 Merged-In: I63b97b573f6b182ba36c4eb933b695d7a6ed59d0 --- libs/sensor/Sensor.cpp | 2 +- services/sensorservice/SensorService.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp index f76d5cffcc..1d61805204 100644 --- a/libs/sensor/Sensor.cpp +++ b/libs/sensor/Sensor.cpp @@ -631,7 +631,7 @@ bool Sensor::unflattenString8(void const*& buffer, size_t& size, String8& output if (size < len) { return false; } - outputString8.setTo(static_cast(buffer), len); + outputString8 = String8(static_cast(buffer), len); if (size < FlattenableUtils::align<4>(len)) { ALOGE("Malformed Sensor String8 field. Should be in a 4-byte aligned buffer but is not."); diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp index 260e61a35d..aa38bbaea7 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp @@ -472,7 +472,7 @@ status_t SensorService::dump(int fd, const Vector& args) { mCurrentOperatingMode = RESTRICTED; // temporarily stop all sensor direct report and disable sensors disableAllSensorsLocked(&connLock); - mWhiteListedPackage.setTo(String8(args[1])); + mWhiteListedPackage = String8(args[1]); return status_t(NO_ERROR); } else if (args.size() == 1 && args[0] == String16("enable")) { // If currently in restricted mode, reset back to NORMAL mode else ignore. @@ -496,7 +496,7 @@ status_t SensorService::dump(int fd, const Vector& args) { // Re-enable sensors. dev.enableAllSensors(); } - mWhiteListedPackage.setTo(String8(args[1])); + mWhiteListedPackage = String8(args[1]); return NO_ERROR; } else if (mCurrentOperatingMode == DATA_INJECTION) { // Already in DATA_INJECTION mode. Treat this as a no_op. -- cgit v1.2.3-59-g8ed1b