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

Commit c2d88d0b authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by Android Git Automerger
Browse files

am f4ea51fd: Merge "camera2: fix an error reading a NULL string" into lmp-mr1-dev 

* commit 'f4ea51fd':
  camera2: fix an error reading a NULL string
parents 9111465a f4ea51fd

camera/camera2/CaptureRequest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -63,9 +63,9 @@ status_t CaptureRequest::readFromParcel(Parcel* parcel) { 
        }



        // Surface.writeToParcel

        String16 name = parcel->readString16();

        ALOGV("%s: Read surface name = %s",

              __FUNCTION__, String8(name).string());

        const char16_t* name = parcel->readString16Inplace(&len);

        ALOGV("%s: Read surface name = %s", __FUNCTION__,

            name != NULL ? String8(name).string() : "<null>");

        sp<IBinder> binder(parcel->readStrongBinder());

        ALOGV("%s: Read surface binder = %p",

              __FUNCTION__, binder.get());