diff options
| author | 2023-08-29 23:27:42 +0000 | |
|---|---|---|
| committer | 2023-08-29 23:27:42 +0000 | |
| commit | 40bb5c89bf4dfb3f1572c180f3099c7ef6028714 (patch) | |
| tree | b24930aeb8e3958e38831e71bd939f0ac0589b97 | |
| parent | 0b42a5baca621c3c4728fc2d6b5fb6387c7f6e39 (diff) | |
| parent | 499710615a3bbfc34dd77df640d656ef49a7ddd6 (diff) | |
Merge "Migrate String8|16.setTo to assignment operator [sensors]" into udc-dev-plus-aosp am: 3b906b0d36 am: 66b2479dc0 am: 499710615a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/24540688
Change-Id: Iaf347eb41cfda7118d246c4787cf5a99a2ed3868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 5c41a1d2e0..a286ccb55b 100644 --- a/services/sensorservice/SensorService.cpp +++ b/services/sensorservice/SensorService.cpp @@ -2371,7 +2371,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()) { @@ -2391,7 +2391,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. |