diff options
| author | Chien-Yu Chen <cychen@google.com> | 2014-11-20 21:08:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-20 21:08:40 +0000 |
| commit | c2d88d0b1571c11187e32b94e281ded17606070f (patch) | |
| tree | 1a9d999de3c24bce3eed179eb704261450164016 /camera | |
| parent | 9111465a5f4a0bed8747da594070f35010644979 (diff) | |
| parent | f4ea51fda9396d7ee851b1d4d220384210ea2336 (diff) | |
| download | frameworks_av-c2d88d0b1571c11187e32b94e281ded17606070f.zip frameworks_av-c2d88d0b1571c11187e32b94e281ded17606070f.tar.gz frameworks_av-c2d88d0b1571c11187e32b94e281ded17606070f.tar.bz2 | |
am f4ea51fd: Merge "camera2: fix an error reading a NULL string" into lmp-mr1-dev
* commit 'f4ea51fda9396d7ee851b1d4d220384210ea2336':
camera2: fix an error reading a NULL string
Diffstat (limited to 'camera')
| -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 57e5319..fb74c8d 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()); |