camera2: Get rid of annoying "Reading a NULL string...." error message
Bug: 10461464
Change-Id: Ie99f025db0e0e12c703f2d391e218b49330ee4dd
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 @@
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 @@
sp<IGraphicBufferProducer> bp;
if (data.readInt32() != 0) {
- String16 name = data.readString16();
+ String16 name = readMaybeEmptyString16(data);
bp = interface_cast<IGraphicBufferProducer>(
data.readStrongBinder());