| commit | 2a8c18b4576fda11a68fe03d189f02b3f61ccac5 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu May 13 19:44:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 13 19:44:55 2021 +0000 |
| tree | ba5478ee68379649c0a85602dd6743ee8f2a7384 | |
| parent | bdde1b1ea9f56a1c61c602340365e50949842a9f [diff] | |
| parent | f2175d3cba403c5cec63b6c597e3617c5221306e [diff] |
Merge "Remove a use of String16::remove." am: 7f48273b74 am: 2b1fe316ea am: f2175d3cba Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1704488 Change-Id: I4b7c23d7941515235b9343e254c53c84bc071481
diff --git a/camera/CaptureResult.cpp b/camera/CaptureResult.cpp index 755051c..be47898 100644 --- a/camera/CaptureResult.cpp +++ b/camera/CaptureResult.cpp
@@ -89,7 +89,7 @@ status_t PhysicalCaptureResultInfo::readFromParcel(const android::Parcel* parcel) { status_t res; - mPhysicalCameraId.remove(mPhysicalCameraId.size()); + mPhysicalCameraId.setTo(u""); mPhysicalCameraMetadata.clear(); if ((res = parcel->readString16(&mPhysicalCameraId)) != OK) {