commit 499710615a3bbfc34dd77df640d656ef49a7ddd6
author Tomasz Wasilczyk <twasilczyk@google.com> Tue Aug 29 20:43:02 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 29 20:43:02 2023 +0000
tree 803c30b68ba23b003513aeb8e9a2acb2a1e90dc5
parent 1ffe14757c1f8f958cbee1f82c0e207eb3dd7247
parent 66b2479dc0325705215f401ae2bdb4e8a8c2c2e4

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

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

Change-Id: I2ee6476e16d54a3183b28d3d52b9761ae816e92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/sensor/Sensor.cpp

diff --git a/libs/sensor/Sensor.cpp b/libs/sensor/Sensor.cpp
index 9127b37..a1549ea 100644
--- a/libs/sensor/Sensor.cpp
+++ b/libs/sensor/Sensor.cpp
@@ -627,7 +627,7 @@
     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

diff --git a/services/sensorservice/SensorService.cpp b/services/sensorservice/SensorService.cpp
index 104dfe2..75d5bca 100644
--- a/services/sensorservice/SensorService.cpp
+++ b/services/sensorservice/SensorService.cpp
@@ -2336,7 +2336,7 @@
         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 @@
                 // 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.