| commit | 109de7ba7550b502f0a474dab0911c989333c24d | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Jun 13 18:40:22 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 13 18:40:22 2018 -0700 |
| tree | e9095900229187af9049e0c660b56e005b46961c | |
| parent | 26e8481fc81f909bad6458d51446497875ac160d [diff] | |
| parent | 52a702181e7af3b928bfc812643fabe6fecd5be3 [diff] |
Merge "screen_ui: Call gr_exit() from dtor." am: 4cd2cf96a0 am: 52a702181e Change-Id: I217c53f19e894b9d0cde6b20a7345c779002a578
diff --git a/screen_ui.cpp b/screen_ui.cpp index b4ef054..e8444b6 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp
@@ -176,6 +176,8 @@ if (progress_thread_.joinable()) { progress_thread_.join(); } + // No-op if gr_init() (via Init()) was not called or had failed. + gr_exit(); } GRSurface* ScreenRecoveryUI::GetCurrentFrame() const {