Closed Bug 1580854 Opened 2 months ago Closed 2 months ago

Allow blocking only level 1 lists with ETP in GV

Categories

(GeckoView :: General, defect, P1)

All
Android
defect

Tracking

(firefox69 wontfix, firefox70 fixed, firefox71 fixed)

RESOLVED FIXED
mozilla71
Tracking Status
firefox69 --- wontfix
firefox70 --- fixed
firefox71 --- fixed

People

(Reporter: droeh, Assigned: droeh)

Details

Attachments

(1 file)

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.

Priority: -- → P1
Attachment #9092420 - Attachment description: Bug 1580854 - Allow blocking level 1 ETP lists in GV. r=#geckoview-reviewers! → Bug 1580854 - Allow blocking level 1 ETP lists in GV. r=snorp!,#geckoview-reviewers!
Pushed by droeh@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/5cfe54b77e78
Allow blocking level 1 ETP lists in GV. r=geckoview-reviewers,snorp,agi
Pushed by droeh@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/3375aa7a81dd
Allow blocking level 1 ETP lists in GV. r=geckoview-reviewers,snorp,agi
Status: NEW → RESOLVED
Closed: 2 months ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla71

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:
Flags: needinfo?(droeh)
Attachment #9092420 - Flags: approval-mozilla-beta?

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.

Attachment #9092420 - Flags: approval-mozilla-beta? → approval-mozilla-beta+

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')

Flags: needinfo?(droeh)

(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.

Flags: needinfo?(droeh)

(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

(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!

You need to log in before you can comment on or make changes to this bug.