| commit | 2b1fe316eaf9b030ebd0b5e95202eeea6548e07e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu May 13 19:19:02 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 13 19:19:02 2021 +0000 |
| tree | 68b110ffcc6eb0334b51b8c1b0dc4970e10d3c50 | |
| parent | 1a1aa414069469119665e4002b07540348640c99 [diff] | |
| parent | 7f48273b7454baf226ac4b08016634e7565391e7 [diff] |
Merge "Remove a use of String16::remove." am: 7f48273b74 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1704488 Change-Id: I698b9a778433894f5d557d2f5e41bd88cf66ba5d
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) {