commit cde4b13a12a0bc8a7bd031f5d5c1b2b2bdd13335
author Narayan Kamath <narayan@google.com> Wed Oct 01 11:06:03 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 01 11:06:03 2014 +0000
tree 276cc4627be5458b51af575b3228427204792516
parent 6ee97e74d2c972dec2aa6a2f231b718eae54898f
parent b0d8d00b2916aef7b01ad42f6d441f5b46b7731a

Merge "Allow more than one dex2oat extra option"

libs/gui/ISurfaceComposerClient.cpp

diff --git a/libs/gui/ISurfaceComposerClient.cpp b/libs/gui/ISurfaceComposerClient.cpp
index 1adc134..60e25c1 100644
--- a/libs/gui/ISurfaceComposerClient.cpp
+++ b/libs/gui/ISurfaceComposerClient.cpp
@@ -95,7 +95,7 @@
             status_t result = createSurface(name, w, h, format, flags,
                     &handle, &gbp);
             reply->writeStrongBinder(handle);
-            reply->writeStrongBinder(gbp->asBinder());
+            reply->writeStrongBinder(gbp != NULL ? gbp->asBinder() : NULL);
             reply->writeInt32(result);
             return NO_ERROR;
         } break;