commit | 52a702181e7af3b928bfc812643fabe6fecd5be3 | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Wed Jun 13 18:37:20 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 13 18:37:20 2018 -0700 |
tree | e9095900229187af9049e0c660b56e005b46961c | |
parent | 93ea3069139ff3a83b0da46d360627980aeee8cd [diff] | |
parent | 4cd2cf96a071c10958fd5e5f6b0b2c6279b328b4 [diff] |
Merge "screen_ui: Call gr_exit() from dtor." am: 4cd2cf96a0 Change-Id: Ib3fba135cfcb1345d17a22b6ba12d03728ebd4c8
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 {