diff options
| author | 2014-10-15 22:52:51 +0000 | |
|---|---|---|
| committer | 2014-10-15 22:52:51 +0000 | |
| commit | 27b780b517eb18582f978da64febb31ecfa8e4bf (patch) | |
| tree | dbabfbcf667a4fbaef5649247226f73779532ef5 /libs/gui/LayerState.cpp | |
| parent | f0ca2ade534275f624daea5ae3ba907a5c63afa6 (diff) | |
| parent | 9cc849500df0bba42d3ed19b90c38ff1dffd2262 (diff) | |
am 9cc84950: Merge "Don\'t check if this == NULL."
* commit '9cc849500df0bba42d3ed19b90c38ff1dffd2262':
Don't check if this == NULL.
Diffstat (limited to 'libs/gui/LayerState.cpp')
| -rw-r--r-- | libs/gui/LayerState.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp index e95d8b6c42..9d3f116a86 100644 --- a/libs/gui/LayerState.cpp +++ b/libs/gui/LayerState.cpp @@ -75,7 +75,7 @@ status_t ComposerState::read(const Parcel& input) { status_t DisplayState::write(Parcel& output) const { output.writeStrongBinder(token); - output.writeStrongBinder(surface->asBinder()); + output.writeStrongBinder(surface != NULL ? surface->asBinder() : NULL); output.writeInt32(what); output.writeInt32(layerStack); output.writeInt32(orientation); |