1580854 - Allow blocking only level 1 lists with ETP in GV

Status: RESOLVED FIXED

(GeckoView :: General, defect, P1)

Description

[Dylan Roeh (:droeh) (he/him)]

Currently GV either blocks level 2 lists with ETP, or blocks nothing. We need to support blocking only level 1 lists to match desktop's behavior in certain cases.

Comment 1

[Dylan Roeh (:droeh) (he/him)]

Attachment: Bug 1580854 - Allow blocking level 1 ETP lists in GV. r=snorp!,#geckoview-reviewers!

Comment 2

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/5cfe54b77e78
Allow blocking level 1 ETP lists in GV. r=geckoview-reviewers,snorp,agi

Comment 3

[Oana Pop-Rus]

Backed out for causing build bustages in GeckoViewActivity.java

Push with failure: https://treeherder.mozilla.org/#/jobs?repo=autoland&resultStatus=superseded%2Ctestfailed%2Cbusted%2Cexception%2Crunnable&revision=5cfe54b77e78a456734b244b0b59fc97b8ff192a&selectedJob=267722586

Failure log: https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=267722586&repo=autoland&lineNumber=34344

Backout: https://hg.mozilla.org/integration/autoland/rev/7c7b0630e4b75a8a873382432979e57406ff61b6

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/3375aa7a81dd
Allow blocking level 1 ETP lists in GV. r=geckoview-reviewers,snorp,agi

Comment 5

[Arthur Iakab [arthur_iakab]]

https://hg.mozilla.org/mozilla-central/rev/3375aa7a81dd

Comment 6

[Dylan Roeh (:droeh) (he/him)]

Comment on attachment 9092420 [details]
Bug 1580854 - Allow blocking level 1 ETP lists in GV. r=snorp!,#geckoview-reviewers!

Beta/Release Uplift Approval Request

• User impact if declined: Minor discrepancy in what lists are used for ETP in Fenix compared to desktop
• Is this code covered by automated tests?: No
• Has the fix been verified in Nightly?: No
• Needs manual test from QE?: No
• If yes, steps to reproduce:
• List of other uplifts needed: None
• Risk to taking this patch: Low
• Why is the change risky/not risky? (and alternatives if risky): Only adds new API to control previously unmodifiable prefs.
• String changes made/needed:

Comment 7

[Liz Henry (:lizzard) (relman/hg->git project)]

Comment on attachment 9092420 [details]
Bug 1580854 - Allow blocking level 1 ETP lists in GV. r=snorp!,#geckoview-reviewers!

MInor change for block lists in geckoview. OK for beta uplift.

Comment 8

[Raul Gurzau (:RaulG)]

Got conflicts while merging to beta:

raul@raul-VirtualBox ~/mozilla-unified beta(0) $ hg graft -er 3375aa7a81dd
grafting 567720:3375aa7a81dd "Bug 1580854 - Allow blocking level 1 ETP lists in GV. r=geckoview-reviewers,snorp,agi"
merging mobile/android/geckoview/api.txt
merging mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java
merging mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md
merging mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/GeckoViewActivity.java
warning: conflicts while merging mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')

Comment 9

[Dylan Roeh (:droeh) (he/him)]

(In reply to Raul Gurzau (:RaulGurzau) from comment #8)

Got conflicts while merging to beta:

raul@raul-VirtualBox ~/mozilla-unified beta(0) $ hg graft -er 3375aa7a81dd
grafting 567720:3375aa7a81dd "Bug 1580854 - Allow blocking level 1 ETP lists in GV. r=geckoview-reviewers,snorp,agi"
merging mobile/android/geckoview/api.txt
merging mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java
merging mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md
merging mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/GeckoViewActivity.java
warning: conflicts while merging mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')

I'll handle the uplift, thanks.

Comment 10

[Dylan Roeh (:droeh) (he/him)]

(In reply to Dylan Roeh (:droeh) (he/him) from comment #9)

(In reply to Raul Gurzau (:RaulGurzau) from comment #8)

Got conflicts while merging to beta:

raul@raul-VirtualBox ~/mozilla-unified beta(0) $ hg graft -er 3375aa7a81dd
grafting 567720:3375aa7a81dd "Bug 1580854 - Allow blocking level 1 ETP lists in GV. r=geckoview-reviewers,snorp,agi"
merging mobile/android/geckoview/api.txt
merging mobile/android/geckoview/src/main/java/org/mozilla/geckoview/ContentBlocking.java
merging mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md
merging mobile/android/geckoview_example/src/main/java/org/mozilla/geckoview_example/GeckoViewActivity.java
warning: conflicts while merging mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md! (edit, then use 'hg resolve --mark')
abort: unresolved conflicts, can't continue
(use 'hg resolve' and 'hg graft --continue')

I'll handle the uplift, thanks.

Pushed: https://hg.mozilla.org/releases/mozilla-beta/rev/7c06b6bd6c08b9481a89b41289586d2720540d94

Comment 11

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

Backed out for landing without bug number: https://hg.mozilla.org/releases/mozilla-beta/rev/c7d7b0404bd515e4f0e26f61371df67c8eb5ecdc
Relanded with bug number: https://hg.mozilla.org/releases/mozilla-beta/rev/4c214d484fdc1384eb9022e5ea701cc23a2fabb6

Comment 12

[Dylan Roeh (:droeh) (he/him)]

(In reply to Sebastian Hengst [:aryx] (needinfo on intermittent or backout) from comment #11)

Backed out for landing without bug number: https://hg.mozilla.org/releases/mozilla-beta/rev/c7d7b0404bd515e4f0e26f61371df67c8eb5ecdc
Relanded with bug number: https://hg.mozilla.org/releases/mozilla-beta/rev/4c214d484fdc1384eb9022e5ea701cc23a2fabb6

Oops, sorry about that. Thanks for relanding!