diff options
| author | Chien-Yu Chen <cychen@google.com> | 2014-11-21 02:45:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-21 02:45:47 +0000 |
| commit | 9f77da1003b5a68034a9c34a057517eabbc24326 (patch) | |
| tree | 997e43d39c1cbb5b7fb6079de34a224bf0da1554 /camera/camera2 | |
| parent | 0cd651d18eeee52be945b0379b667473549bbf63 (diff) | |
| parent | c2d88d0b1571c11187e32b94e281ded17606070f (diff) | |
| download | frameworks_av-9f77da1003b5a68034a9c34a057517eabbc24326.zip frameworks_av-9f77da1003b5a68034a9c34a057517eabbc24326.tar.gz frameworks_av-9f77da1003b5a68034a9c34a057517eabbc24326.tar.bz2 | |
am f4ea51fd: Merge "camera2: fix an error reading a NULL string" into lmp-mr1-dev
automerge: c2d88d0
* commit 'c2d88d0b1571c11187e32b94e281ded17606070f':
camera2: fix an error reading a NULL string
Diffstat (limited to 'camera/camera2')
| -rw-r--r-- | camera/camera2/CaptureRequest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/camera/camera2/CaptureRequest.cpp b/camera/camera2/CaptureRequest.cpp index d5e1c5b..66d6913 100644 --- a/camera/camera2/CaptureRequest.cpp +++ b/camera/camera2/CaptureRequest.cpp @@ -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()); |