commit 96fc72d19e17d6d6dae1f3bdaca888a2db658f77
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Sep 23 05:59:09 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 23 05:59:10 2016 +0000
tree 075e9b58258fe71bea64ac9bec41078f6ad578ba
parent 95c48ed47c2de072697d98609d2575f3ac459eea
parent 7407963cd42385ddb73d2acd1be72858d34bf242

Merge "Surface: Allow nullable IGBPs when unparceling a Surface"

libs/gui/Surface.cpp

diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
index 0838290..d78a681 100644
--- a/libs/gui/Surface.cpp
+++ b/libs/gui/Surface.cpp
@@ -1393,14 +1393,18 @@
         int isSingleBuffered;
         res = parcel->readInt32(&isSingleBuffered);
         if (res != OK) {
+            ALOGE("Can't read isSingleBuffered");
             return res;
         }
     }
 
     sp<IBinder> binder;
 
-    res = parcel->readStrongBinder(&binder);
-    if (res != OK) return res;
+    res = parcel->readNullableStrongBinder(&binder);
+    if (res != OK) {
+        ALOGE("%s: Can't read strong binder", __FUNCTION__);
+        return res;
+    }
 
     graphicBufferProducer = interface_cast<IGraphicBufferProducer>(binder);