| commit | 5b2d0884b3ea45dffb66cc9429821e961ea88aa0 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Jun 13 18:45:34 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 13 18:45:34 2018 -0700 |
| tree | e9095900229187af9049e0c660b56e005b46961c | |
| parent | a475967ba1e62bff135e3c5387064e3eac5e19fe [diff] | |
| parent | 109de7ba7550b502f0a474dab0911c989333c24d [diff] |
Merge "screen_ui: Call gr_exit() from dtor." am: 4cd2cf96a0 am: 52a702181e am: 109de7ba75 Change-Id: I9c97e98dcc60409e3605e42e1293ec1bd57391e9
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 {