-
Notifications
You must be signed in to change notification settings - Fork 15
/
fenix-liberate.patch
1039 lines (998 loc) · 44 KB
/
fenix-liberate.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/android-components/.buildconfig.yml
--- a/mobile/android/android-components/.buildconfig.yml Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/android-components/.buildconfig.yml Tue Sep 03 14:12:01 2024 -0400
@@ -1593,16 +1593,6 @@
- support-base
- support-test
- tooling-lint
- lib-push-firebase:
- description: An implementation of concept-push for the Firebase Message Service.
- path: components/lib/push-firebase
- publish: true
- upstream_dependencies:
- - concept-base
- - concept-push
- - support-base
- - support-test
- - tooling-lint
lib-state:
description: A library for maintaining application state.
path: components/lib/state
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt
--- a/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/android-components/plugins/dependencies/src/main/java/DependenciesPlugin.kt Tue Sep 03 14:12:01 2024 -0400
@@ -93,14 +93,9 @@
}
object Firebase {
- const val messaging = "24.0.0"
}
object Google {
- const val play_review = "2.0.1"
- const val play_services_ads_id = "16.0.0"
- const val play_services_base = "18.5.0"
- const val play_services_fido = "21.1.0"
}
}
@@ -237,11 +232,5 @@
const val thirdparty_disklrucache = "com.jakewharton:disklrucache:${Versions.disklrucache}"
const val thirdparty_androidsvg = "com.caverock:androidsvg-aar:${Versions.androidsvg}"
- const val firebase_messaging = "com.google.firebase:firebase-messaging:${Versions.Firebase.messaging}"
-
- const val play_review = "com.google.android.play:review:${Versions.Google.play_review}"
- const val play_review_ktx = "com.google.android.play:review-ktx:${Versions.Google.play_review}"
- const val play_services_ads_id = "com.google.android.gms:play-services-ads-identifier:${Versions.Google.play_services_ads_id}"
- const val play_services_base = "com.google.android.gms:play-services-base:${Versions.Google.play_services_base}"
- const val play_services_fido = "com.google.android.gms:play-services-fido:${Versions.Google.play_services_fido}"
+ const val play_services_ads_id = "org.microg.gms:play-services-ads-identifier:0.3.2.240913"
}
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/.buildconfig.yml
--- a/mobile/android/fenix/.buildconfig.yml Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/.buildconfig.yml Tue Sep 03 14:12:01 2024 -0400
@@ -63,7 +63,6 @@
- lib-crash-sentry
- lib-dataprotect
- lib-publicsuffixlist
- - lib-push-firebase
- lib-state
- service-contile
- service-digitalassetlinks
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/build.gradle
--- a/mobile/android/fenix/app/build.gradle Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/app/build.gradle Tue Sep 03 14:12:01 2024 -0400
@@ -660,7 +660,6 @@
implementation project(':lib-crash')
implementation project(':lib-crash-sentry')
- implementation project(':lib-push-firebase')
implementation project(':lib-state')
implementation project(':lib-dataprotect')
testImplementation project(':support-test-fakes')
@@ -704,16 +703,9 @@
implementation FenixDependencies.protobuf_javalite
implementation ComponentsDependencies.google_material
- implementation FenixDependencies.adjust
- implementation FenixDependencies.installreferrer // Required by Adjust
-
// Required for the Google Advertising ID
implementation ComponentsDependencies.play_services_ads_id
- // Required for in-app reviews
- implementation ComponentsDependencies.play_review
- implementation ComponentsDependencies.play_review_ktx
-
implementation FenixDependencies.androidx_profileinstaller
constraints {
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/proguard-rules.pro
--- a/mobile/android/fenix/app/proguard-rules.pro Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/app/proguard-rules.pro Tue Sep 03 14:12:01 2024 -0400
@@ -1,23 +1,6 @@
-dontobfuscate
####################################################################################################
-# Sentry
-####################################################################################################
-
-# Recommended config via https://docs.sentry.io/clients/java/modules/android/#manual-integration
-# Since we don't obfuscate, we don't need to use their Gradle plugin to upload ProGuard mappings.
--keepattributes LineNumberTable,SourceFile
--dontwarn org.slf4j.**
--dontwarn javax.**
-
-# Our addition: this class is saved to disk via Serializable, which ProGuard doesn't like.
-# If we exclude this, upload silently fails (Sentry swallows a NPE so we don't crash).
-# I filed https://github.com/getsentry/sentry-java/issues/572
-#
-# If Sentry ever mysteriously stops working after we upgrade it, this could be why.
--keep class io.sentry.event.Event { *; }
-
-####################################################################################################
# Android and GeckoView built-ins
####################################################################################################
@@ -69,58 +52,6 @@
-keep class org.mozilla.fenix.**ViewModel { *; }
-####################################################################################################
-# Adjust
-####################################################################################################
-
--keep public class com.adjust.sdk.** { *; }
--keep class com.google.android.gms.common.ConnectionResult {
- int SUCCESS;
-}
--keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {
- com.google.android.gms.ads.identifier.AdvertisingIdClient$Info getAdvertisingIdInfo(android.content.Context);
-}
--keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info {
- java.lang.String getId();
- boolean isLimitAdTrackingEnabled();
-}
--keep public class com.android.installreferrer.** { *; }
--keep class dalvik.system.VMRuntime {
- java.lang.String getRuntime();
-}
--keep class android.os.Build {
- java.lang.String[] SUPPORTED_ABIS;
- java.lang.String CPU_ABI;
-}
--keep class android.content.res.Configuration {
- android.os.LocaledList getLocales();
- java.util.Locale locale;
-}
--keep class android.os.LocaleList {
- java.util.Locale get(int);
-}
-
-# Keep code generated from Glean Metrics
--keep class org.mozilla.fenix.GleanMetrics.** { *; }
-
-# Keep motionlayout internal methods
-# https://github.com/mozilla-mobile/fenix/issues/2094
--keep class androidx.constraintlayout.** { *; }
-
-# Keep adjust relevant classes
--keep class com.adjust.sdk.** { *; }
--keep class com.google.android.gms.common.ConnectionResult {
- int SUCCESS;
-}
--keep class com.google.android.gms.ads.identifier.AdvertisingIdClient {
- com.google.android.gms.ads.identifier.AdvertisingIdClient$Info getAdvertisingIdInfo(android.content.Context);
-}
--keep class com.google.android.gms.ads.identifier.AdvertisingIdClient$Info {
- java.lang.String getId();
- boolean isLimitAdTrackingEnabled();
-}
--keep public class com.android.installreferrer.** { *; }
-
# Keep Android Lifecycle methods
# https://bugzilla.mozilla.org/show_bug.cgi?id=1596302
-keep class androidx.lifecycle.** { *; }
@@ -130,3 +61,11 @@
-dontwarn java.beans.IntrospectionException
-dontwarn java.beans.Introspector
-dontwarn java.beans.PropertyDescriptor
+
+####################################################################################################
+# Checker Framework
+####################################################################################################
+
+-dontwarn org.checkerframework.checker.nullness.qual.EnsuresNonNull
+-dontwarn org.checkerframework.checker.nullness.qual.EnsuresNonNullIf
+-dontwarn org.checkerframework.checker.nullness.qual.RequiresNonNull
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjust.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/Adjust.java Tue Sep 03 14:12:01 2024 -0400
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2012-2017 adjust GmbH,
+ * http://www.adjust.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.adjust.sdk;
+
+import android.content.Context;
+
+public class Adjust {
+ public static void onCreate(AdjustConfig adjustConfig) {
+ }
+
+ public static void trackEvent(AdjustEvent event) {
+ }
+
+ public static void onResume() {
+ }
+
+ public static void onPause() {
+ }
+
+ public static void setEnabled(boolean enabled) {
+ }
+
+ public static void gdprForgetMe(final Context context) {
+ }
+}
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustAttribution.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustAttribution.java Tue Sep 03 14:12:01 2024 -0400
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2012-2017 adjust GmbH,
+ * http://www.adjust.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.adjust.sdk;
+
+import java.io.Serializable;
+
+public class AdjustAttribution implements Serializable {
+ public String network;
+ public String campaign;
+ public String adgroup;
+ public String creative;
+
+ @Override
+ public boolean equals(Object other) {
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return 0;
+ }
+
+ @Override
+ public String toString() {
+ return "";
+ }
+}
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustConfig.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustConfig.java Tue Sep 03 14:12:01 2024 -0400
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2012-2017 adjust GmbH,
+ * http://www.adjust.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.adjust.sdk;
+
+import android.content.Context;
+
+import java.util.List;
+
+public class AdjustConfig {
+ public static final String ENVIRONMENT_SANDBOX = "sandbox";
+ public static final String ENVIRONMENT_PRODUCTION = "production";
+
+ public AdjustConfig(Context context, String appToken, String environment) {
+ }
+
+ public AdjustConfig(Context context, String appToken, String environment, boolean allowSuppressLogLevel) {
+ }
+
+ public void setOnAttributionChangedListener(OnAttributionChangedListener onAttributionChangedListener) {
+ }
+
+ public void setPreinstallTrackingEnabled(boolean preinstallTrackingEnabled) {
+ }
+
+ public void setLogLevel(LogLevel logLevel) {
+ }
+}
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustEvent.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/AdjustEvent.java Tue Sep 03 14:12:01 2024 -0400
@@ -0,0 +1,31 @@
+package com.adjust.sdk;
+
+/**
+ * Created by pfms on 05/11/14.
+ */
+public class AdjustEvent {
+
+ public AdjustEvent(String eventToken) {
+ }
+
+ public void setRevenue(double revenue, String currency) {
+ }
+
+ public void addCallbackParameter(String key, String value) {
+ }
+
+ public void addPartnerParameter(String key, String value) {
+ }
+
+ public void setOrderId(String orderId) {
+ }
+
+ public void setCallbackId(String callbackId) {
+ }
+
+ public void setProductId(String productId) {
+ }
+
+ public void setPurchaseToken(String purchaseToken) {
+ }
+}
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/com/adjust/sdk/Constants.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/Constants.java Tue Sep 03 14:12:01 2024 -0400
@@ -0,0 +1,18 @@
+//
+// Constants.java
+// Adjust
+//
+// Created by keyboardsurfer on 2013-11-08.
+// Copyright (c) 2012-2014 adjust GmbH. All rights reserved.
+// See the file MIT-LICENSE for copying permission.
+//
+
+package com.adjust.sdk;
+
+/**
+ * @author keyboardsurfer
+ * @since 8.11.13
+ */
+public interface Constants {
+ String ADJUST_PREINSTALL_SYSTEM_PROPERTY_PATH = "adjust.preinstall.path";
+}
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/com/adjust/sdk/LogLevel.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/LogLevel.java Tue Sep 03 14:12:01 2024 -0400
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2012-2017 adjust GmbH,
+ * http://www.adjust.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.adjust.sdk;
+
+import android.util.Log;
+
+/**
+ * Created by pfms on 11/03/15.
+ */
+public enum LogLevel {
+ VERBOSE(Log.VERBOSE), DEBUG(Log.DEBUG), INFO(Log.INFO), WARN(Log.WARN), ERROR(Log.ERROR), ASSERT(Log.ASSERT), SUPRESS(8);
+ final int androidLogLevel;
+
+ LogLevel(final int androidLogLevel) {
+ this.androidLogLevel = androidLogLevel;
+ }
+
+ public int getAndroidLogLevel() {
+ return androidLogLevel;
+ }
+}
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/com/adjust/sdk/OnAttributionChangedListener.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/adjust/sdk/OnAttributionChangedListener.java Tue Sep 03 14:12:01 2024 -0400
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2012-2017 adjust GmbH,
+ * http://www.adjust.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package com.adjust.sdk;
+
+public interface OnAttributionChangedListener {
+ void onAttributionChanged(AdjustAttribution attribution);
+}
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java Tue Sep 03 14:12:01 2024 -0400
@@ -0,0 +1,42 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.firebase.messaging;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+
+public class FirebaseMessagingService extends Service {
+
+ private final IBinder mBinder = new Binder();
+
+ public void onMessageReceived(RemoteMessage message) {
+ }
+
+ public void onMessageSent(String msgId) {
+ }
+
+ public void onNewToken(String token) {
+ }
+
+ public void onSendError(String msgId, Exception exception) {
+ }
+
+ @Override
+ public IBinder onBind(Intent intent) {
+ return mBinder;
+ }
+
+}
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/RemoteMessage.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/com/google/firebase/messaging/RemoteMessage.java Tue Sep 03 14:12:01 2024 -0400
@@ -0,0 +1,33 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.firebase.messaging;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import java.util.Map;
+
+public class RemoteMessage implements Parcelable {
+
+ public int describeContents() {
+ return 0;
+ }
+
+ public void writeToParcel(Parcel out, int flags) {
+ }
+
+ public Map<String, String> getData() {
+ return null;
+ }
+
+}
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/mozilla/components/lib/push/firebase/AbstractFirebasePushService.kt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/java/mozilla/components/lib/push/firebase/AbstractFirebasePushService.kt Tue Sep 03 14:12:01 2024 -0400
@@ -0,0 +1,32 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package mozilla.components.lib.push.firebase
+
+import android.content.Context
+import com.google.firebase.messaging.FirebaseMessagingService
+import com.google.firebase.messaging.RemoteMessage
+import mozilla.components.concept.push.PushService
+
+abstract class AbstractFirebasePushService() : FirebaseMessagingService(), PushService {
+
+ override fun start(context: Context) {
+ }
+
+ override fun onNewToken(newToken: String) {
+ }
+
+ override fun onMessageReceived(remoteMessage: RemoteMessage?) {
+ }
+
+ final override fun stop() {
+ }
+
+ override fun deleteToken() {
+ }
+
+ override fun isServiceAvailable(context: Context): Boolean {
+ return false
+ }
+}
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt Tue Sep 03 14:12:01 2024 -0400
@@ -18,7 +18,7 @@
* This feature does not only depend on this flag. It requires the AMO collection override to
* be enabled which is behind the Secret Settings.
* */
- val customExtensionCollectionFeature = Config.channel.isNightlyOrDebug || Config.channel.isBeta
+ val customExtensionCollectionFeature = true
/**
* Pull-to-refresh allows you to pull the web content down far enough to have the page to
@@ -37,7 +37,7 @@
fun isPocketRecommendationsFeatureEnabled(context: Context): Boolean {
val langTag = LocaleManager.getCurrentLocale(context)
?.toLanguageTag() ?: getSystemDefault().toLanguageTag()
- return listOf("en-US", "en-CA").contains(langTag)
+ return false && listOf("en-US", "en-CA").contains(langTag)
}
/**
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt Tue Sep 03 14:12:01 2024 -0400
@@ -1113,19 +1113,16 @@
view = view,
)
- // This component feature only works on Fenix when built on Mozilla infrastructure.
- if (BuildConfig.MOZILLA_OFFICIAL) {
- webAuthnFeature.set(
- feature = WebAuthnFeature(
- engine = requireComponents.core.engine,
- activity = requireActivity(),
- exitFullScreen = requireComponents.useCases.sessionUseCases.exitFullscreen::invoke,
- currentTab = { store.state.selectedTabId },
- ),
- owner = this,
- view = view,
- )
- }
+ webAuthnFeature.set(
+ feature = WebAuthnFeature(
+ engine = requireComponents.core.engine,
+ activity = requireActivity(),
+ exitFullScreen = requireComponents.useCases.sessionUseCases.exitFullscreen::invoke,
+ currentTab = { store.state.selectedTabId },
+ ),
+ owner = this,
+ view = view,
+ )
screenOrientationFeature.set(
feature = ScreenOrientationFeature(
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt Tue Sep 03 14:12:01 2024 -0400
@@ -10,7 +10,6 @@
import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalContext
import androidx.core.app.NotificationManagerCompat
-import com.google.android.play.core.review.ReviewManagerFactory
import mozilla.components.feature.addons.AddonManager
import mozilla.components.feature.addons.amo.AMOAddonsProvider
import mozilla.components.feature.addons.migration.DefaultSupportedAddonsChecker
@@ -173,7 +172,6 @@
val reviewPromptController by lazyMonitored {
ReviewPromptController(
- manager = ReviewManagerFactory.create(context),
reviewSettings = FenixReviewSettings(settings),
)
}
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt Tue Sep 03 14:12:01 2024 -0400
@@ -562,8 +562,14 @@
} else {
defaultTopSites.add(
Pair(
- context.getString(R.string.default_top_site_google),
- SupportUtils.GOOGLE_URL,
+ context.getString(R.string.default_top_site_fdroid),
+ SupportUtils.FDROID_URL,
+ ),
+ )
+ defaultTopSites.add(
+ Pair(
+ context.getString(R.string.default_top_site_eff),
+ SupportUtils.EFF_URL,
),
)
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/ReviewPromptController.kt Tue Sep 03 14:12:01 2024 -0400
@@ -6,8 +6,6 @@
import android.app.Activity
import androidx.annotation.VisibleForTesting
-import com.google.android.play.core.review.ReviewInfo
-import com.google.android.play.core.review.ReviewManager
import kotlinx.coroutines.Dispatchers.Main
import kotlinx.coroutines.withContext
import org.mozilla.fenix.GleanMetrics.ReviewPrompt
@@ -45,24 +43,9 @@
* Controls the Review Prompt behavior.
*/
class ReviewPromptController(
- private val manager: ReviewManager,
private val reviewSettings: ReviewSettings,
private val timeNowInMillis: () -> Long = { System.currentTimeMillis() },
- private val tryPromptReview: suspend (Activity) -> Unit = { activity ->
- val flow = manager.requestReviewFlow()
-
- withContext(Main) {
- flow.addOnCompleteListener {
- if (it.isSuccessful) {
- manager.launchReviewFlow(activity, it.result)
- recordReviewPromptEvent(
- it.result.toString(),
- reviewSettings.numberOfAppLaunches,
- Date(),
- )
- }
- }
- }
+ private val tryPromptReview: suspend (Activity) -> Unit = { _ ->
},
) {
@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsService.kt Tue Sep 03 14:12:01 2024 -0400
@@ -6,14 +6,10 @@
import android.content.Context
import android.os.RemoteException
-import com.android.installreferrer.api.InstallReferrerClient
-import com.android.installreferrer.api.InstallReferrerStateListener
import mozilla.components.support.base.log.logger.Logger
import org.json.JSONException
import org.json.JSONObject
import org.mozilla.fenix.FeatureFlags
-import org.mozilla.fenix.GleanMetrics.MetaAttribution
-import org.mozilla.fenix.GleanMetrics.PlayStoreAttribution
import org.mozilla.fenix.ext.settings
import org.mozilla.fenix.utils.Settings
import java.io.UnsupportedEncodingException
@@ -29,85 +25,9 @@
private val logger = Logger("InstallReferrerMetricsService")
override val type = MetricServiceType.Data
- private var referrerClient: InstallReferrerClient? = null
-
- override fun start() {
- if (context.settings().utmParamsKnown) {
- return
- }
-
- val timerId = PlayStoreAttribution.attributionTime.start()
- val client = InstallReferrerClient.newBuilder(context).build()
- referrerClient = client
-
- client.startConnection(
- object : InstallReferrerStateListener {
- override fun onInstallReferrerSetupFinished(responseCode: Int) {
- PlayStoreAttribution.attributionTime.stopAndAccumulate(timerId)
- val firstSession = FirstSessionPing(context)
-
- when (responseCode) {
- InstallReferrerClient.InstallReferrerResponse.OK -> {
- // Connection established.
- val installReferrerResponse = try {
- client.installReferrer.installReferrer
- } catch (e: RemoteException) {
- // We can't do anything about this.
- logger.error("Failed to retrieve install referrer response", e)
- null
- } catch (e: SecurityException) {
- logger.error("Failed to retrieve install referrer response", e)
- null
- }
-
- if (installReferrerResponse.isNullOrBlank()) {
- return
- }
-
- PlayStoreAttribution.installReferrerResponse.set(installReferrerResponse)
+ override fun start() { /* noop */ }
- val utmParams = UTMParams.parseUTMParameters(installReferrerResponse)
- if (FeatureFlags.metaAttributionEnabled) {
- MetaParams.extractMetaAttribution(utmParams.content)
- ?.recordMetaAttribution()
- }
-
- utmParams.recordInstallReferrer(context.settings())
- context.settings().utmParamsKnown = true
-
- firstSession.checkAndSend()
- }
-
- InstallReferrerClient.InstallReferrerResponse.FEATURE_NOT_SUPPORTED,
- InstallReferrerClient.InstallReferrerResponse.DEVELOPER_ERROR,
- InstallReferrerClient.InstallReferrerResponse.PERMISSION_ERROR,
- -> {
- // unrecoverable errors, but we still want to send the first-session ping.
- context.settings().utmParamsKnown = true
- firstSession.checkAndSend()
- }
-
- InstallReferrerClient.InstallReferrerResponse.SERVICE_UNAVAILABLE -> {
- // Connection couldn't be established.
- }
- }
- // End the connection, and null out the client.
- stop()
- }
-
- override fun onInstallReferrerServiceDisconnected() {
- // Try to restart the connection on the next request to
- // Google Play by calling the startConnection() method.
- referrerClient = null
- }
- },
- )
- }
-
- override fun stop() {
- referrerClient?.endConnection()
- referrerClient = null
- }
+ override fun stop() { /* noop */ }
override fun track(event: Event) = Unit
@@ -225,12 +145,6 @@
return
}
intoSettings(settings)
-
- PlayStoreAttribution.source.set(source)
- PlayStoreAttribution.medium.set(medium)
- PlayStoreAttribution.campaign.set(campaign)
- PlayStoreAttribution.content.set(content)
- PlayStoreAttribution.term.set(term)
}
}
@@ -325,9 +239,6 @@
* record META attribution params to telemetry
*/
fun recordMetaAttribution() {
- MetaAttribution.app.set(app)
- MetaAttribution.t.set(t)
- MetaAttribution.data.set(data)
- MetaAttribution.nonce.set(nonce)
+ return
}
}
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/topsites/TopSiteItemViewHolder.kt Tue Sep 03 14:12:01 2024 -0400
@@ -162,6 +162,12 @@
SupportUtils.MEITUAN_URL -> {
binding.faviconImage.setImageDrawable(getDrawable(itemView.context, R.drawable.ic_meituan))
}
+ SupportUtils.FDROID_URL -> {
+ binding.faviconImage.setImageDrawable(getDrawable(itemView.context, R.drawable.ic_fdroid))
+ }
+ SupportUtils.EFF_URL -> {
+ binding.faviconImage.setImageDrawable(getDrawable(itemView.context, R.drawable.ic_eff))
+ }
else -> {
itemView.context.components.core.icons.loadIntoView(binding.faviconImage, topSite.url)
}
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt Tue Sep 03 14:12:01 2024 -0400
@@ -38,6 +38,8 @@
const val GOOGLE_US_URL = "https://www.google.com/webhp?client=firefox-b-1-m&channel=ts"
const val GOOGLE_XX_URL = "https://www.google.com/webhp?client=firefox-b-m&channel=ts"
const val WHATS_NEW_URL = "https://www.mozilla.org/firefox/android/notes"
+ const val FDROID_URL = "https://f-droid.org/"
+ const val EFF_URL = "https://www.eff.org/"
// This is locale-less on purpose so that the content negotiation happens on the AMO side because the current
// user language might not be supported by AMO and/or the language might not be exactly what AMO is expecting
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Tue Sep 03 14:12:01 2024 -0400
@@ -341,7 +341,7 @@
var isTelemetryEnabled by booleanPreference(
appContext.getPreferenceKey(R.string.pref_key_telemetry),
- default = true,
+ default = false,
)
var isMarketingTelemetryEnabled by booleanPreference(
@@ -351,7 +351,7 @@
var isExperimentationEnabled by booleanPreference(
appContext.getPreferenceKey(R.string.pref_key_experimentation),
- default = true,
+ default = false,
)
var isOverrideTPPopupsForPerformanceTest = false
@@ -1664,7 +1664,7 @@
var showPocketRecommendationsFeature by lazyFeatureFlagPreference(
appContext.getPreferenceKey(R.string.pref_key_pocket_homescreen_recommendations),
featureFlag = FeatureFlags.isPocketRecommendationsFeatureEnabled(appContext),
- default = { homescreenSections[HomeScreenSection.POCKET] == true },
+ default = { false },
)
/**
@@ -1722,7 +1722,7 @@
*/
var showContileFeature by booleanPreference(
key = appContext.getPreferenceKey(R.string.pref_key_enable_contile),
- default = true,
+ default = false,
)
/**
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/res/values/static_strings_extra.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/fenix/app/src/main/res/values/static_strings_extra.xml Tue Sep 03 14:12:01 2024 -0400
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<resources>
+ <string name="default_top_site_fdroid" translatable="false">F-Droid</string>
+ <string name="default_top_site_eff" translatable="false">EFF</string>
+</resources>
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/res/xml/preferences.xml
--- a/mobile/android/fenix/app/src/main/res/xml/preferences.xml Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/app/src/main/res/xml/preferences.xml Tue Sep 03 14:12:01 2024 -0400
@@ -139,11 +139,6 @@
app:iconSpaceReserved="false"
android:title="@string/preferences_notifications" />
- <androidx.preference.Preference
- android:key="@string/pref_key_data_choices"
- app:iconSpaceReserved="false"
- android:title="@string/preferences_data_collection" />
-
</androidx.preference.PreferenceCategory>
<PreferenceCategory
@@ -201,11 +196,6 @@
app:iconSpaceReserved="false"
android:layout="@layout/preference_category_no_icon_style">
<androidx.preference.Preference
- android:key="@string/pref_key_rate"
- app:iconSpaceReserved="false"
- android:title="@string/preferences_rate" />
-
- <androidx.preference.Preference
android:key="@string/pref_key_about"
app:iconSpaceReserved="false"
android:title="@string/preferences_about" />
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml
--- a/mobile/android/fenix/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml Tue Sep 03 14:12:01 2024 -0400
@@ -3,7 +3,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<androidx.preference.PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android">
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.preference.Preference
android:icon="@drawable/ic_camera_enabled"
android:key="@string/pref_key_phone_feature_camera"
@@ -44,7 +45,8 @@
android:icon="@drawable/ic_link"
android:key="@string/pref_key_browser_feature_media_key_system_access"
android:title="@string/preference_phone_feature_media_key_system_access"
- android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
+ android:summary="@string/preference_option_phone_feature_ask_to_allow"
+ app:isPreferenceVisible="false"/>
<androidx.preference.Preference
android:icon="@drawable/ic_autoplay"
diff -r 9ed61936fc73 -r 870ba181df30 mobile/android/fenix/app/src/main/res/xml/site_permissions_preferences.xml
--- a/mobile/android/fenix/app/src/main/res/xml/site_permissions_preferences.xml Tue Sep 03 14:05:53 2024 -0400
+++ b/mobile/android/fenix/app/src/main/res/xml/site_permissions_preferences.xml Tue Sep 03 14:12:01 2024 -0400
@@ -64,6 +64,7 @@
android:key="@string/pref_key_browser_feature_media_key_system_access"
android:title="@string/preference_phone_feature_media_key_system_access"
android:summary="@string/preference_option_phone_feature_ask_to_allow"
+ app:isPreferenceVisible="false"
app:allowDividerBelow="true"/>