From 88aef23d00a509693a955b6a207c0fb023fbc92d Mon Sep 17 00:00:00 2001
From: Igor Murashkin <iam@google.com>
Date: Fri, 23 Aug 2013 17:47:06 -0700
Subject: camera2: Get rid of annoying "Reading a NULL string...." error
 message

Bug: 10461464
Change-Id: Ie99f025db0e0e12c703f2d391e218b49330ee4dd
---
 camera/camera2/ICameraDeviceUser.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'camera')

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());
 
-- 
cgit v1.1