diff options
| author | Igor Murashkin <iam@google.com> | 2013-08-26 20:22:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-26 20:22:37 +0000 |
| commit | 8271f1a2225a34a0748624786392213a746c56d7 (patch) | |
| tree | a96adf21a3d37f00e2001121fd56eeceac1882f6 /camera | |
| parent | 3bd3690fb0a423f9d0ba635e8db1c148ac9e93fc (diff) | |
| parent | 88aef23d00a509693a955b6a207c0fb023fbc92d (diff) | |
| download | frameworks_av-8271f1a2225a34a0748624786392213a746c56d7.zip frameworks_av-8271f1a2225a34a0748624786392213a746c56d7.tar.gz frameworks_av-8271f1a2225a34a0748624786392213a746c56d7.tar.bz2 | |
Merge "camera2: Get rid of annoying "Reading a NULL string...." error message" into klp-dev
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/camera2/ICameraDeviceUser.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/camera/camera2/ICameraDeviceUser.cpp b/camera/camera2/ICameraDeviceUser.cpp index 923f487..73fec72 100644 --- a/camera/camera2/ICameraDeviceUser.cpp +++ b/camera/camera2/ICameraDeviceUser.cpp @@ -43,6 +43,19 @@ enum { WAIT_UNTIL_IDLE, }; +namespace { + // Read empty strings without printing a false error message. + String16 readMaybeEmptyString16(const Parcel& parcel) { + size_t len; + const char16_t* str = parcel.readString16Inplace(&len); + if (str != NULL) { + return String16(str, len); + } else { + return String16(); + } + } +}; + class BpCameraDeviceUser : public BpInterface<ICameraDeviceUser> { public: @@ -250,7 +263,7 @@ status_t BnCameraDeviceUser::onTransact( sp<IGraphicBufferProducer> bp; if (data.readInt32() != 0) { - String16 name = data.readString16(); + String16 name = readMaybeEmptyString16(data); bp = interface_cast<IGraphicBufferProducer>( data.readStrongBinder()); |