diff options
author | android-build-team Robot | 2017-10-05 02:30:32 -0500 |
---|---|---|
committer | android-build-team Robot | 2017-10-05 02:30:32 -0500 |
commit | 666e90ffc939a27db63bd7c031fe70ebc8676b73 (patch) | |
tree | 020714c820767689d6e22f8609469c8c9a5cea8a | |
parent | 8fcb37ebbf6c3b0e5303f93523fb657b447dd8b8 (diff) | |
parent | 35b5114be8da71c69fc8a1ff8fb457c912c0992f (diff) | |
download | frameworks-native-666e90ffc939a27db63bd7c031fe70ebc8676b73.tar.gz frameworks-native-666e90ffc939a27db63bd7c031fe70ebc8676b73.tar.xz frameworks-native-666e90ffc939a27db63bd7c031fe70ebc8676b73.zip |
Snap for 4378450 from 35b5114be8da71c69fc8a1ff8fb457c912c0992f to oc-mr1-release
Change-Id: I93cf952e3df19205d63b3d3bd4fccc22cd262432
-rw-r--r-- | libs/hwc2on1adapter/HWC2On1Adapter.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libs/hwc2on1adapter/HWC2On1Adapter.cpp b/libs/hwc2on1adapter/HWC2On1Adapter.cpp index e1b9a8a6f..77f06bbbe 100644 --- a/libs/hwc2on1adapter/HWC2On1Adapter.cpp +++ b/libs/hwc2on1adapter/HWC2On1Adapter.cpp | |||
@@ -426,7 +426,13 @@ Error HWC2On1Adapter::registerCallback(Callback descriptor, | |||
426 | 426 | ||
427 | std::unique_lock<std::recursive_timed_mutex> lock(mStateMutex); | 427 | std::unique_lock<std::recursive_timed_mutex> lock(mStateMutex); |
428 | 428 | ||
429 | mCallbacks[descriptor] = {callbackData, pointer}; | 429 | if (pointer != nullptr) { |
430 | mCallbacks[descriptor] = {callbackData, pointer}; | ||
431 | } else { | ||
432 | ALOGI("unregisterCallback(%s)", to_string(descriptor).c_str()); | ||
433 | mCallbacks.erase(descriptor); | ||
434 | return Error::None; | ||
435 | } | ||
430 | 436 | ||
431 | bool hasPendingInvalidate = false; | 437 | bool hasPendingInvalidate = false; |
432 | std::vector<hwc2_display_t> displayIds; | 438 | std::vector<hwc2_display_t> displayIds; |