diff options
| author | 2023-08-29 19:31:23 +0000 | |
|---|---|---|
| committer | 2023-08-29 19:31:23 +0000 | |
| commit | 3b906b0d361b7cdf444ba56bb38fb84b717ee380 (patch) | |
| tree | ef9c51d9d49135c68b02e5e861b7fdc072d46954 | |
| parent | 07fd56cc13775516a3dc8878159ff483902142a1 (diff) | |
| parent | d89f609d2cbdba779372de6e80e849d7cb33e99d (diff) | |
Merge "Migrate String8|16.setTo to assignment operator [sensors]" into udc-dev-plus-aosp
| -rw-r--r-- | libs/sensor/Sensor.cpp | 2 | ||||
| -rw-r--r-- | 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 9127b3772b..a1549ea385 100644 --- a/libs/sensor/Sensor.cpp +++ b/libs/sensor/Sensor.cpp @@ -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."); diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp index c69b072525..4701efb056 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp @@ -2341,7 +2341,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()) { @@ -2361,7 +2361,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. |