| commit | 41f284894ab469df77a75b2401bc5d543b7331bb | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu May 13 19:53:26 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 13 19:53:26 2021 +0000 |
| tree | 590d99d4be556f72f5ac7b50fc2af32b771cd6d9 | |
| parent | 80cda089ec1d197a37febeccbe2a6514db15e5b7 [diff] | |
| parent | 2a8c18b4576fda11a68fe03d189f02b3f61ccac5 [diff] |
Merge "Remove a use of String16::remove." am: 7f48273b74 am: 2b1fe316ea am: f2175d3cba am: 2a8c18b457 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1704488 Change-Id: Ie20c1de420283738f0a816b441b11ed174586b32
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) {