Commit 2a7f4d63 authored May 13, 2021 by Elliott Hughes Committed by Automerger Merge Worker May 13, 2021

Merge "Remove a use of String16::remove." am: 7f48273b am: 2b1fe316 am:...

Merge "Remove a use of String16::remove." am: 7f48273b am: 2b1fe316 am: f2175d3c am: 2a8c18b4

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1704488

Change-Id: Ib481540baed51e6063019ee3be87d9f12b8724e5

camera/CaptureResult.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ status_t CaptureResultExtras::writeToParcel(android::Parcel *parcel) const {
		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) {