am 6ee97e74: Merge "Fix a null dereference."

* commit '6ee97e74d2c972dec2aa6a2f231b718eae54898f':
  Fix a null dereference.
This commit is contained in:
Dan Albert 2014-09-23 17:54:39 +00:00 committed by Android Git Automerger
commit 56b3f887a2

View File

@ -114,7 +114,7 @@ status_t BnSurfaceComposerClient::onTransact(
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;