Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

10907: Fix threading for certain adblock service methods (1.12) #6330

Merged
merged 3 commits into from
Aug 4, 2020
Merged

10907: Fix threading for certain adblock service methods (1.12) #6330

merged 3 commits into from
Aug 4, 2020

Conversation

iefremov
Copy link
Contributor

@iefremov iefremov commented Aug 4, 2020 •
edited by kjozwiak
Loading

Uplift of #6250 (crash fix)
Uplift of #6318 (broken build)
Uplift of #6319 (broken lint)

Resolves brave/brave-browser#10907

Approved, please ensure that before merging:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.
  • You have tested your change on Nightly.
  • The PR milestones match the branch they are landing to.

After you merge:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

iefremov added 3 commits August 4, 2020 11:19
@iefremov
10907: Fix threading for certain adblock service methods.
5943ccd 
Fix brave/brave-browser#10907

Some functionality of adblock service must be used only on
certain TaskRunner, so this fixes a couple of methods that
were previously called from UI thread. It also required
making the corresponding extension shields API functions
async. I also did some small code style improvements.

(cherry picked from commit a5762c3)
@iefremov
10907: Fix broken unittests.
8419cdb 
Fixes brave/brave-browser#10907

(cherry picked from commit 471769d)
@iefremov
10907: Fix broken lint
a3d9b50 
Fixes brave/brave-browser#10907

(cherry picked from commit dc82778)
@iefremov iefremov added this to the 1.12.x - Release milestone Aug 4, 2020
@iefremov iefremov requested a review from a team August 4, 2020 04:21
@iefremov iefremov changed the title 10907: Fix threading for certain adblock service methods (1.13) 10907: Fix threading for certain adblock service methods (1.12) Aug 4, 2020
@kjozwiak
Copy link
Member

kjozwiak commented Aug 4, 2020

Restarting Android as npm run audit_deps failed as per https://ci.brave.com/job/pr-brave-browser-ie_cosmetic_crash_1.12/1/execution/node/283/log/.

@kjozwiak kjozwiak added CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Aug 4, 2020
kjozwiak
kjozwiak approved these changes Aug 4, 2020
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.12.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit 18b327c into 1.12.x Aug 4, 2020
@kjozwiak kjozwiak deleted the ie_cosmetic_crash_1.12 branch August 4, 2020 17:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees
No one assigned
Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Milestone
1.12.x - Release #1
Development

Successfully merging this pull request may close these issues.
2 participants
@iefremov @kjozwiak