Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2175d3c authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I5b20c7a3381fe63964c954b6afde2a9c5385cf4e
parents 631f088f 2b1fe316

camera/CaptureResult.cpp

+1 −1
Original line number Original line 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 PhysicalCaptureResultInfo::readFromParcel(const android::Parcel* parcel) {

    status_t res;

    status_t res;





    mPhysicalCameraId.remove(mPhysicalCameraId.size());

    mPhysicalCameraId.setTo(u"");

    mPhysicalCameraMetadata.clear();

    mPhysicalCameraMetadata.clear();





    if ((res = parcel->readString16(&mPhysicalCameraId)) != OK) {

    if ((res = parcel->readString16(&mPhysicalCameraId)) != OK) {