| commit | 45e695a248ab9548c1e8ab976572f7a978ecd64b | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Jul 23 19:56:38 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 23 18:56:15 2014 +0000 |
| tree | 60cd1379e2a52764d85a678dbc5b4268586f33eb | |
| parent | 9b365296a745751c08731f369435e00682165f18 [diff] | |
| parent | 18fae75350bcd5f19ef90afb533e3fbedfd4c83b [diff] |
Merge "crash if getNativeBuffer() called on NULL GraphicBuffer" into lmp-dev
diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp index e21dc53..9b0bd60 100644 --- a/libs/ui/GraphicBuffer.cpp +++ b/libs/ui/GraphicBuffer.cpp
@@ -126,6 +126,7 @@ ANativeWindowBuffer* GraphicBuffer::getNativeBuffer() const { + LOG_ALWAYS_FATAL_IF(this == NULL, "getNativeBuffer() called on NULL GraphicBuffer"); return static_cast<ANativeWindowBuffer*>( const_cast<GraphicBuffer*>(this)); }