Skip to content

Commit 95cb19f

Browse files
authored
Fixed problem where AndroidShellHolder was trashing the ThreadHost in its deconstructor (flutter#24644)
1 parent c574153 commit 95cb19f

File tree

3 files changed

+1
-11
lines changed

3 files changed

+1
-11
lines changed

shell/common/thread_host.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,4 @@ ThreadHost::ThreadHost(std::string name_prefix_arg, uint64_t mask)
3535

3636
ThreadHost::~ThreadHost() = default;
3737

38-
void ThreadHost::Reset() {
39-
platform_thread.reset();
40-
ui_thread.reset();
41-
raster_thread.reset();
42-
io_thread.reset();
43-
profiler_thread.reset();
44-
}
45-
4638
} // namespace flutter

shell/common/thread_host.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ struct ThreadHost {
3838
ThreadHost(std::string name_prefix, uint64_t type_mask);
3939

4040
~ThreadHost();
41-
42-
void Reset();
4341
};
4442

4543
} // namespace flutter

shell/platform/android/android_shell_holder.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ AndroidShellHolder::AndroidShellHolder(
170170

171171
AndroidShellHolder::~AndroidShellHolder() {
172172
shell_.reset();
173-
thread_host_->Reset();
173+
thread_host_.reset();
174174
}
175175

176176
bool AndroidShellHolder::IsValid() const {

0 commit comments

Comments
 (0)