commit d0722779b39fecb7ca06aa05d87cb9e88b10ba53
author Oleksiy Vyalov <ovyalov@google.com> Fri Mar 24 22:49:54 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 24 22:49:54 2017 +0000
tree 713ae4f4d016691667278b163968144b258eb0d8
parent 130e634e639a92a79653d8cbb2a84288a0040580
parent ead847255f341c6543e27d77af64daccd7da2879

Merge "Make CameraStatus::cameraId to use String16."

camera/CameraBase.cpp

diff --git a/camera/CameraBase.cpp b/camera/CameraBase.cpp
index 60effe2..c53e6c3 100644
--- a/camera/CameraBase.cpp
+++ b/camera/CameraBase.cpp
@@ -56,17 +56,19 @@
 }
 
 status_t CameraStatus::writeToParcel(android::Parcel* parcel) const {
-    status_t res;
-    res = parcel->writeString8(cameraId);
+    auto res = parcel->writeString16(String16(cameraId));
     if (res != OK) return res;
+
     res = parcel->writeInt32(status);
     return res;
 }
 
 status_t CameraStatus::readFromParcel(const android::Parcel* parcel) {
-    status_t res;
-    res = parcel->readString8(&cameraId);
+    String16 tempCameraId;
+    auto res = parcel->readString16(&tempCameraId);
     if (res != OK) return res;
+    cameraId = String8(tempCameraId);
+
     res = parcel->readInt32(&status);
     return res;
 }