-
Notifications
You must be signed in to change notification settings - Fork 5
/
frameworks_base.diff
5609 lines (5526 loc) · 359 KB
/
frameworks_base.diff
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 --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index e0622fa96e12..bdba41c1fccb 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -818,95 +818,8 @@ public class ApplicationPackageManager extends PackageManager {
}
};
- private static final String[] pTensorCodenames = {
- "felix",
- "tangorpro",
- "lynx",
- "cheetah",
- "panther",
- "bluejay",
- "oriole",
- "raven"
- };
-
- private static final String[] featuresPixel = {
- "com.google.android.apps.photos.PIXEL_2019_PRELOAD",
- "com.google.android.apps.photos.PIXEL_2019_MIDYEAR_PRELOAD",
- "com.google.android.apps.photos.PIXEL_2018_PRELOAD",
- "com.google.android.apps.photos.PIXEL_2017_PRELOAD",
- "com.google.android.feature.PIXEL_2020_EXPERIENCE",
- "com.google.android.feature.PIXEL_2020_MIDYEAR_EXPERIENCE",
- "com.google.android.feature.PIXEL_2019_EXPERIENCE",
- "com.google.android.feature.PIXEL_2019_MIDYEAR_EXPERIENCE",
- "com.google.android.feature.PIXEL_2018_EXPERIENCE",
- "com.google.android.feature.PIXEL_2017_EXPERIENCE",
- "com.google.android.feature.PIXEL_EXPERIENCE",
- "com.google.android.feature.GOOGLE_BUILD",
- "com.google.android.feature.GOOGLE_EXPERIENCE"
- };
-
- private static final String[] featuresPixelOthers = {
- "com.google.android.feature.ASI",
- "com.google.android.feature.ANDROID_ONE_EXPERIENCE",
- "com.google.android.feature.GOOGLE_FI_BUNDLED",
- "com.google.android.feature.LILY_EXPERIENCE",
- "com.google.android.feature.TURBO_PRELOAD",
- "com.google.android.feature.WELLBEING",
- "com.google.lens.feature.IMAGE_INTEGRATION",
- "com.google.lens.feature.CAMERA_INTEGRATION",
- "com.google.photos.trust_debug_certs",
- "com.google.android.feature.AER_OPTIMIZED",
- "com.google.android.feature.NEXT_GENERATION_ASSISTANT",
- "android.software.game_service",
- "com.google.android.feature.EXCHANGE_6_2",
- "com.google.android.apps.dialer.call_recording_audio",
- "com.google.android.apps.dialer.SUPPORTED"
- };
-
- private static final String[] featuresP23 = {
- "com.google.android.feature.PIXEL_2024_EXPERIENCE",
- "com.google.android.feature.PIXEL_2024_MIDYEAR_EXPERIENCE",
- "com.google.android.feature.PIXEL_2023_EXPERIENCE",
- "com.google.android.feature.PIXEL_2023_MIDYEAR_EXPERIENCE"
- };
-
- private static final String[] featuresTensor = {
- "com.google.android.feature.PIXEL_2022_EXPERIENCE",
- "com.google.android.feature.PIXEL_2022_MIDYEAR_EXPERIENCE",
- "com.google.android.feature.PIXEL_2021_EXPERIENCE",
- "com.google.android.feature.PIXEL_2021_MIDYEAR_EXPERIENCE"
- };
-
- private static final String[] featuresNexus = {
- "com.google.android.apps.photos.NEXUS_PRELOAD",
- "com.google.android.apps.photos.nexus_preload",
- "com.google.android.feature.PIXEL_EXPERIENCE",
- "com.google.android.feature.GOOGLE_BUILD",
- "com.google.android.feature.GOOGLE_EXPERIENCE"
- };
-
@Override
public boolean hasSystemFeature(String name, int version) {
- String packageName = ActivityThread.currentPackageName();
- if (packageName != null &&
- packageName.equals("com.google.android.apps.photos") &&
- SystemProperties.getBoolean("persist.sys.pixelprops.gphotos", true)) {
- if (Arrays.asList(featuresPixel).contains(name)) return false;
- if (Arrays.asList(featuresPixelOthers).contains(name)) return true;
- if (Arrays.asList(featuresP23).contains(name)) return false;
- if (Arrays.asList(featuresTensor).contains(name)) return false;
- if (Arrays.asList(featuresNexus).contains(name)) return true;
- }
- if (Arrays.asList(featuresTensor).contains(name) &&
- !Arrays.asList(pTensorCodenames).contains(SystemProperties.get("ro.product.device"))) {
- return false;
- } else if (packageName != null && Arrays.asList(featuresTensor).contains(name)) {
- if (packageName.contains("com.google.android.apps.nexuslauncher")) {
- return false;
- }
- }
- if (Arrays.asList(featuresPixel).contains(name)) return true;
- if (Arrays.asList(featuresPixelOthers).contains(name)) return true;
return mHasSystemFeatureCache.query(new HasSystemFeatureQuery(name, version));
}
diff --git a/core/java/android/app/Instrumentation.java b/core/java/android/app/Instrumentation.java
index 44cbcd62bcb6..2fa3a7ecb7dd 100644
--- a/core/java/android/app/Instrumentation.java
+++ b/core/java/android/app/Instrumentation.java
@@ -64,8 +64,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeoutException;
-import com.android.internal.util.crdroid.PixelPropsUtils;
-
/**
* Base class for implementing application instrumentation code. When running
* with instrumentation turned on, this class will be instantiated for you
@@ -1244,8 +1242,6 @@ public class Instrumentation {
Application app = getFactory(context.getPackageName())
.instantiateApplication(cl, className);
app.attach(context);
- String packageName = context.getPackageName();
- PixelPropsUtils.setProps(packageName);
return app;
}
@@ -1263,8 +1259,6 @@ public class Instrumentation {
ClassNotFoundException {
Application app = (Application)clazz.newInstance();
app.attach(context);
- String packageName = context.getPackageName();
- PixelPropsUtils.setProps(packageName);
return app;
}
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index fc2c416343c0..719fa719a420 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -12088,12 +12088,6 @@ public final class Settings {
*/
public static final String SHOW_CLIPBOARD_OVERLAY = "show_clipboard_overlay";
- /**
- * Face Unlock Method
- * @hide
- */
- public static final String FACE_UNLOCK_METHOD = "face_unlock_method";
-
/**
* Control whether GMS is enabled for this user.
* @hide
diff --git a/core/java/com/android/internal/util/crdroid/PixelPropsUtils.java b/core/java/com/android/internal/util/crdroid/PixelPropsUtils.java
deleted file mode 100644
index a709985d1a2d..000000000000
--- a/core/java/com/android/internal/util/crdroid/PixelPropsUtils.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/*
- * Copyright (C) 2020 The Pixel Experience Project
- * 2021-2024 crDroid Android Project
- *
- * 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.android.internal.util.crdroid;
-
-import android.app.Application;
-import android.os.Build;
-import android.os.SystemProperties;
-import android.util.Log;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-public class PixelPropsUtils {
-
- private static final String TAG = PixelPropsUtils.class.getSimpleName();
- private static final String DEVICE = "ro.product.device";
- private static final boolean DEBUG = false;
-
- private static final String SPOOF_PIXEL_GAPPS = "persist.sys.pixelprops.gapps";
- private static final String SPOOF_PIXEL_GMS = "persist.sys.pixelprops.gms";
- private static final String SPOOF_PIXEL_GAMES = "persist.sys.pixelprops.games";
- private static final String SPOOF_PIXEL_GPHOTOS = "persist.sys.pixelprops.gphotos";
- private static final String SPOOF_PIXEL_NETFLIX = "persist.sys.pixelprops.netflix";
-
- private static final Map<String, Object> propsToChangeGeneric;
- private static final Map<String, Object> propsToChangePixel5a;
- private static final Map<String, Object> propsToChangePixel8Pro;
- private static final Map<String, Object> propsToChangePixelXL;
- private static final Map<String, Object> propsToChangeROG6;
- private static final Map<String, Object> propsToChangeXP5;
- private static final Map<String, Object> propsToChangeOP8P;
- private static final Map<String, Object> propsToChangeOP9P;
- private static final Map<String, Object> propsToChangeMI11TP;
- private static final Map<String, Object> propsToChangeMI13P;
- private static final Map<String, Object> propsToChangeF5;
- private static final Map<String, Object> propsToChangeBS4;
- private static final Map<String, ArrayList<String>> propsToKeep;
-
- // Packages to Spoof as Pixel 8 Pro
- private static final String[] packagesToChangePixel8Pro = {
- "com.android.chrome",
- "com.android.vending",
- "com.google.android.apps.customization.pixel",
- "com.google.android.apps.emojiwallpaper",
- "com.google.android.apps.privacy.wildlife",
- "com.google.android.apps.wallpaper",
- "com.google.android.apps.wallpaper.pixel",
- "com.google.android.googlequicksearchbox",
- "com.google.android.wallpaper.effects",
- "com.google.pixel.livewallpaper",
- "com.nhs.online.nhsonline",
- "com.netflix.mediaclient"
- };
-
- // Packages to Spoof as Pixel 5a
- private static final String[] packagesToChangePixel5a = {
- "com.google.android.tts",
- "com.breel.wallpapers20"
- };
-
- // Packages to Keep with original device
- private static final String[] packagesToKeep = {
- "com.google.android.apps.motionsense.bridge",
- "com.google.android.apps.nexuslauncher",
- "com.google.android.apps.pixelmigrate",
- "com.google.android.apps.recorder",
- "com.google.android.apps.restore",
- "com.google.android.apps.subscriptions.red",
- "com.google.android.apps.tachyon",
- "com.google.android.apps.tycho",
- "com.google.android.apps.wearables.maestro.companion",
- "com.google.android.apps.youtube.kids",
- "com.google.android.apps.youtube.music",
- "com.google.android.as",
- "com.google.android.backup",
- "com.google.android.backuptransport",
- "com.google.android.dialer",
- "com.google.android.euicc",
- "com.google.android.setupwizard",
- "com.google.android.youtube",
- "com.google.ar.core",
- "com.google.intelligence.sense",
- "com.google.oslo"
- };
-
- // Packages to Spoof as ROG Phone 6
- private static final String[] packagesToChangeROG6 = {
- "com.activision.callofduty.shooter",
- "com.ea.gp.fifamobile",
- "com.gameloft.android.ANMP.GloftA9HM",
- "com.madfingergames.legends",
- "com.pearlabyss.blackdesertm",
- "com.pearlabyss.blackdesertm.gl"
- };
-
- // Packages to Spoof as Xperia 5
- private static final String[] packagesToChangeXP5 = {
- "com.garena.game.codm",
- "com.tencent.tmgp.kr.codm",
- "com.vng.codmvn"
- };
-
- // Packages to Spoof as OnePlus 8 Pro
- private static final String[] packagesToChangeOP8P = {
- "com.netease.lztgglobal",
- "com.pubg.imobile",
- "com.pubg.krmobile",
- "com.rekoo.pubgm",
- "com.riotgames.league.wildrift",
- "com.riotgames.league.wildrifttw",
- "com.riotgames.league.wildriftvn",
- "com.riotgames.league.teamfighttactics",
- "com.riotgames.league.teamfighttacticstw",
- "com.riotgames.league.teamfighttacticsvn",
- "com.tencent.ig",
- "com.tencent.tmgp.pubgmhd",
- "com.vng.pubgmobile"
- };
-
- // Packages to Spoof as OnePlus 9 Pro
- private static final String[] packagesToChangeOP9P = {
- "com.epicgames.fortnite",
- "com.epicgames.portal",
- "com.tencent.lolm"
- };
-
- // Packages to Spoof as Mi 11T Pro
- private static final String[] packagesToChangeMI11TP = {
- "com.ea.gp.apexlegendsmobilefps",
- "com.levelinfinite.hotta.gp",
- "com.supercell.clashofclans",
- "com.vng.mlbbvn"
- };
-
- // Packages to Spoof as Xiaomi 13 Pro
- private static final String[] packagesToChangeMI13P = {
- "com.levelinfinite.sgameGlobal",
- "com.tencent.tmgp.sgame"
- };
-
- // Packages to Spoof as POCO F5
- private static final String[] packagesToChangeF5 = {
- "com.dts.freefiremax",
- "com.dts.freefireth",
- "com.mobile.legends"
- };
-
- // Packages to Spoof as Black Shark 4
- private static final String[] packagesToChangeBS4 = {
- "com.proximabeta.mf.uamo"
- };
-
- private static volatile boolean sIsGms = false;
- private static volatile boolean sIsFinsky = false;
- private static volatile boolean sIsExcluded = false;
-
- static {
- propsToKeep = new HashMap<>();
- propsToKeep.put("com.google.android.settings.intelligence", new ArrayList<>(Collections.singletonList("FINGERPRINT")));
- propsToChangeGeneric = new HashMap<>();
- propsToChangeGeneric.put("TYPE", "user");
- propsToChangeGeneric.put("TAGS", "release-keys");
- propsToChangePixel8Pro = new HashMap<>();
- propsToChangePixel8Pro.put("BRAND", "google");
- propsToChangePixel8Pro.put("MANUFACTURER", "Google");
- propsToChangePixel8Pro.put("DEVICE", "husky");
- propsToChangePixel8Pro.put("PRODUCT", "husky");
- propsToChangePixel8Pro.put("HARDWARE", "husky");
- propsToChangePixel8Pro.put("MODEL", "Pixel 8 Pro");
- propsToChangePixel8Pro.put("ID", "AP1A.240305.019.A1");
- propsToChangePixel8Pro.put("FINGERPRINT", "google/husky/husky:14/AP1A.240305.019.A1/11445699:user/release-keys");
- propsToChangePixel5a = new HashMap<>();
- propsToChangePixel5a.put("BRAND", "google");
- propsToChangePixel5a.put("MANUFACTURER", "Google");
- propsToChangePixel5a.put("DEVICE", "barbet");
- propsToChangePixel5a.put("PRODUCT", "barbet");
- propsToChangePixel5a.put("HARDWARE", "barbet");
- propsToChangePixel5a.put("MODEL", "Pixel 5a");
- propsToChangePixel5a.put("ID", "AP1A.240305.019.A1");
- propsToChangePixel5a.put("FINGERPRINT", "google/barbet/barbet:14/AP1A.240305.019.A1/11445699:user/release-keys");
- propsToChangePixelXL = new HashMap<>();
- propsToChangePixelXL.put("BRAND", "google");
- propsToChangePixelXL.put("MANUFACTURER", "Google");
- propsToChangePixelXL.put("DEVICE", "marlin");
- propsToChangePixelXL.put("PRODUCT", "marlin");
- propsToChangePixelXL.put("HARDWARE", "marlin");
- propsToChangePixelXL.put("MODEL", "Pixel XL");
- propsToChangePixelXL.put("ID", "QP1A.191005.007.A3");
- propsToChangePixelXL.put("FINGERPRINT", "google/marlin/marlin:10/QP1A.191005.007.A3/5972272:user/release-keys");
- propsToChangeROG6 = new HashMap<>();
- propsToChangeROG6.put("BRAND", "asus");
- propsToChangeROG6.put("MANUFACTURER", "asus");
- propsToChangeROG6.put("DEVICE", "AI2201");
- propsToChangeROG6.put("MODEL", "ASUS_AI2201");
- propsToChangeXP5 = new HashMap<>();
- propsToChangeXP5.put("MODEL", "SO-52A");
- propsToChangeXP5.put("MANUFACTURER", "Sony");
- propsToChangeOP8P = new HashMap<>();
- propsToChangeOP8P.put("MODEL", "IN2020");
- propsToChangeOP8P.put("MANUFACTURER", "OnePlus");
- propsToChangeOP9P = new HashMap<>();
- propsToChangeOP9P.put("MODEL", "LE2123");
- propsToChangeOP9P.put("MANUFACTURER", "OnePlus");
- propsToChangeMI11TP = new HashMap<>();
- propsToChangeMI11TP.put("MODEL", "2107113SI");
- propsToChangeMI11TP.put("MANUFACTURER", "Xiaomi");
- propsToChangeMI13P = new HashMap<>();
- propsToChangeMI13P.put("BRAND", "Xiaomi");
- propsToChangeMI13P.put("MANUFACTURER", "Xiaomi");
- propsToChangeMI13P.put("MODEL", "2210132C");
- propsToChangeF5 = new HashMap<>();
- propsToChangeF5.put("MODEL", "23049PCD8G");
- propsToChangeF5.put("MANUFACTURER", "Xiaomi");
- propsToChangeBS4 = new HashMap<>();
- propsToChangeBS4.put("MODEL", "2SM-X706B");
- propsToChangeBS4.put("MANUFACTURER", "blackshark");
- }
-
- public static void setProps(String packageName) {
- propsToChangeGeneric.forEach((k, v) -> setPropValue(k, v));
-
- if (packageName == null || packageName.isEmpty()) {
- return;
- }
- if (packageName.startsWith("com.google.")
- || packageName.startsWith("com.samsung.")
- || Arrays.asList(packagesToChangePixel8Pro).contains(packageName)
- || Arrays.asList(packagesToChangePixel5a).contains(packageName)) {
-
- if (!SystemProperties.getBoolean(SPOOF_PIXEL_GAPPS, true))
- return;
-
- if (Arrays.asList(packagesToKeep).contains(packageName) ||
- packageName.startsWith("com.google.android.GoogleCamera")) {
- sIsExcluded = true;
- return;
- }
-
- Map<String, Object> propsToChange = new HashMap<>();
-
- if (packageName.equals("com.google.android.apps.photos")) {
- if (SystemProperties.getBoolean(SPOOF_PIXEL_GPHOTOS, true)) {
- propsToChange.putAll(propsToChangePixelXL);
- } else {
- propsToChange.putAll(propsToChangePixel5a);
- }
- } else if (packageName.equals("com.netflix.mediaclient") &&
- !SystemProperties.getBoolean(SPOOF_PIXEL_NETFLIX, false)) {
- if (DEBUG) Log.d(TAG, "Netflix spoofing disabled by system prop");
- return;
- } else if (packageName.equals("com.android.vending") &&
- SystemProperties.getBoolean(SPOOF_PIXEL_GMS, true)) {
- sIsFinsky = true;
- return;
- } else if (Arrays.asList(packagesToChangePixel8Pro).contains(packageName)) {
- propsToChange.putAll(propsToChangePixel8Pro);
- } else {
- propsToChange.putAll(propsToChangePixel5a);
- }
-
- if (DEBUG) Log.d(TAG, "Defining props for: " + packageName);
- for (Map.Entry<String, Object> prop : propsToChange.entrySet()) {
- String key = prop.getKey();
- Object value = prop.getValue();
- if (propsToKeep.containsKey(packageName) && propsToKeep.get(packageName).contains(key)) {
- if (DEBUG) Log.d(TAG, "Not defining " + key + " prop for: " + packageName);
- continue;
- }
- if (DEBUG) Log.d(TAG, "Defining " + key + " prop for: " + packageName);
- setPropValue(key, value);
- }
- if (packageName.equals("com.google.android.gms") &&
- SystemProperties.getBoolean(SPOOF_PIXEL_GMS, true)) {
- setPropValue("TIME", System.currentTimeMillis());
- final String processName = Application.getProcessName();
- if (processName.toLowerCase().contains("unstable")
- || processName.toLowerCase().contains("instrumentation")) {
- sIsGms = true;
- spoofBuildGms();
- }
- return;
- }
- // Set proper indexing fingerprint
- if (packageName.equals("com.google.android.settings.intelligence")) {
- setPropValue("FINGERPRINT", Build.VERSION.INCREMENTAL);
- }
- } else {
-
- if (!SystemProperties.getBoolean(SPOOF_PIXEL_GAMES, false))
- return;
-
- if (Arrays.asList(packagesToChangeROG6).contains(packageName)) {
- if (DEBUG) Log.d(TAG, "Defining props for: " + packageName);
- for (Map.Entry<String, Object> prop : propsToChangeROG6.entrySet()) {
- String key = prop.getKey();
- Object value = prop.getValue();
- setPropValue(key, value);
- }
- } else if (Arrays.asList(packagesToChangeXP5).contains(packageName)) {
- if (DEBUG) Log.d(TAG, "Defining props for: " + packageName);
- for (Map.Entry<String, Object> prop : propsToChangeXP5.entrySet()) {
- String key = prop.getKey();
- Object value = prop.getValue();
- setPropValue(key, value);
- }
- } else if (Arrays.asList(packagesToChangeOP8P).contains(packageName)) {
- if (DEBUG) Log.d(TAG, "Defining props for: " + packageName);
- for (Map.Entry<String, Object> prop : propsToChangeOP8P.entrySet()) {
- String key = prop.getKey();
- Object value = prop.getValue();
- setPropValue(key, value);
- }
- } else if (Arrays.asList(packagesToChangeOP9P).contains(packageName)) {
- if (DEBUG) Log.d(TAG, "Defining props for: " + packageName);
- for (Map.Entry<String, Object> prop : propsToChangeOP9P.entrySet()) {
- String key = prop.getKey();
- Object value = prop.getValue();
- setPropValue(key, value);
- }
- } else if (Arrays.asList(packagesToChangeMI11TP).contains(packageName)) {
- if (DEBUG) Log.d(TAG, "Defining props for: " + packageName);
- for (Map.Entry<String, Object> prop : propsToChangeMI11TP.entrySet()) {
- String key = prop.getKey();
- Object value = prop.getValue();
- setPropValue(key, value);
- }
- } else if (Arrays.asList(packagesToChangeMI13P).contains(packageName)) {
- if (DEBUG) Log.d(TAG, "Defining props for: " + packageName);
- for (Map.Entry<String, Object> prop : propsToChangeMI13P.entrySet()) {
- String key = prop.getKey();
- Object value = prop.getValue();
- setPropValue(key, value);
- }
- } else if (Arrays.asList(packagesToChangeF5).contains(packageName)) {
- if (DEBUG) Log.d(TAG, "Defining props for: " + packageName);
- for (Map.Entry<String, Object> prop : propsToChangeF5.entrySet()) {
- String key = prop.getKey();
- Object value = prop.getValue();
- setPropValue(key, value);
- }
- } else if (Arrays.asList(packagesToChangeBS4).contains(packageName)) {
- if (DEBUG) Log.d(TAG, "Defining props for: " + packageName);
- for (Map.Entry<String, Object> prop : propsToChangeBS4.entrySet()) {
- String key = prop.getKey();
- Object value = prop.getValue();
- setPropValue(key, value);
- }
- }
- }
- }
-
- private static void setPropValue(String key, Object value) {
- try {
- if (DEBUG) Log.d(TAG, "Defining prop " + key + " to " + value.toString());
- Field field = Build.class.getDeclaredField(key);
- field.setAccessible(true);
- field.set(null, value);
- field.setAccessible(false);
- } catch (NoSuchFieldException | IllegalAccessException e) {
- Log.e(TAG, "Failed to set prop " + key, e);
- }
- }
-
- private static void setVersionField(String key, Object value) {
- try {
- if (DEBUG) Log.d(TAG, "Defining prop " + key + " to " + value.toString());
- Field field = Build.VERSION.class.getDeclaredField(key);
- field.setAccessible(true);
- field.set(null, value);
- field.setAccessible(false);
- } catch (NoSuchFieldException | IllegalAccessException e) {
- Log.e(TAG, "Failed to set prop " + key, e);
- }
- }
-
- private static void setVersionFieldString(String key, String value) {
- try {
- if (DEBUG) Log.d(TAG, "Defining prop " + key + " to " + value);
- Field field = Build.VERSION.class.getDeclaredField(key);
- field.setAccessible(true);
- field.set(null, value);
- field.setAccessible(false);
- } catch (NoSuchFieldException | IllegalAccessException e) {
- Log.e(TAG, "Failed to set prop " + key, e);
- }
- }
-
- private static void spoofBuildGms() {
- // Alter build parameters to avoid hardware attestation enforcement
- setPropValue("BRAND", "motorola");
- setPropValue("MANUFACTURER", "motorola");
- setPropValue("DEVICE", "griffin");
- setPropValue("ID", "MCC24.246-37");
- setPropValue("FINGERPRINT", "motorola/griffin_retcn/griffin:6.0.1/MCC24.246-37/42:user/release-keys");
- setPropValue("MODEL", "XT1650-05");
- setPropValue("PRODUCT", "griffin_retcn");
- setVersionFieldString("SECURITY_PATCH", "2016-07-01");
- }
-
- private static boolean isCallerSafetyNet() {
- return sIsGms && Arrays.stream(Thread.currentThread().getStackTrace())
- .anyMatch(elem -> elem.getClassName().contains("DroidGuard"));
- }
-
- public static void onEngineGetCertificateChain() {
- // Check stack for SafetyNet or Play Integrity
- if ((isCallerSafetyNet() || sIsFinsky) && !sIsExcluded) {
- Log.i(TAG, "Blocked key attestation sIsGms=" + sIsGms + " sIsFinsky=" + sIsFinsky);
- throw new UnsupportedOperationException();
- }
- }
-}
diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml
index 294b3d8ceda4..93b6c4947ad3 100644
--- a/core/res/res/values-af/strings.xml
+++ b/core/res/res/values-af/strings.xml
@@ -665,6 +665,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Kan nie jou gesigmodel skep nie. Probeer weer."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Donkerbril bespeur. Jou gesig moet heeltemal sigbaar wees."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Gesigbedekking bespeur. Jou gesig moet heeltemal sigbaar wees."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"Kan nie gesig verifieer nie. Hardeware nie beskikbaar nie."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Probeer Gesigslot weer"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"Kan nie nuwe gesigdata berg nie. Vee eers \'n ou een uit."</string>
@@ -682,6 +684,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Gebruik Gesigslot of Skermslot"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Gebruik jou gesig om voort te gaan"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Gebruik jou gesig of skermslot om voort te gaan"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"Iets is fout. Probeer weer."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"Gesig-ikoon"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"lees sinkroniseer-instellings"</string>
diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml
index ab4742993c84..65ce60910c73 100644
--- a/core/res/res/values-am/strings.xml
+++ b/core/res/res/values-am/strings.xml
@@ -665,6 +665,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"የመልክዎን ሞዴል መፍጠር አልተቻለም። እንደገና ይሞክሩ።"</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"ጠቆር ያሉ መነጽሮች ተገኝተዋል። መልክዎ ሙሉ በሙሉ መታየት አለበት።"</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"የመልክ መሸፈኛ ተገኝቷል። መልክዎ ሙሉ በሙሉ መታየት አለበት።"</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"መልክን ማረጋገጥ አይቻልም። ሃርድዌር የለም።"</string>
<string name="face_error_timeout" msgid="2598544068593889762">"በመልክ መክፈትን እንደገና ይሞክሩ"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"አዲስ የመልክ ውውሂብ ማስቀመጥ አልተቻለም። መጀመሪያ የድሮውን ይሰርዙት።"</string>
@@ -682,6 +684,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"የመልክ ወይም የማያ ገጽ መቆለፊያን ይጠቀሙ"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"ለመቀጠል መልክዎን ይጠቀሙ"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"ለመቀጠል መልክዎን ወይም የማያ ገጽዎን መቆለፊያ ይጠቀሙ"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"የሆነ ችግር ተፈጥሯል። እንደገና ይሞክሩ።"</string>
<string name="face_icon_content_description" msgid="465030547475916280">"የፊት አዶ"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"የሥምሪያ ቅንብሮች አንብብ"</string>
diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml
index b8b50d47d342..f98ff1f6d8b1 100644
--- a/core/res/res/values-ar/strings.xml
+++ b/core/res/res/values-ar/strings.xml
@@ -669,6 +669,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"يتعذّر إنشاء نموذج الوجه. يُرجى إعادة المحاولة."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"تمّ رصد نظارة شمسية. يجب أن يكون وجهك ظاهرًا بالكامل."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"تمّ رصد قناع على الوجه. يجب أن يكون وجهك ظاهرًا بالكامل."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"يتعذّر التحقُّق من الوجه. الجهاز غير مُتاح."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"جرِّب \"فتح الجهاز بالتعرف على الوجه\" مرة أخرى."</string>
<string name="face_error_no_space" msgid="5649264057026021723">"يتعذَّر تخزين بيانات الوجه الجديد. احذف الوجه القديم أولاً."</string>
@@ -686,6 +688,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"استخدام ميزة \"فتح الجهاز بالتعرف على الوجه\" أو ميزة \"قفل الشاشة\""</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"استخدِم الوجه للمتابعة"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"استخدام ميزة \"فتح القفل بالوجه\" أو ميزة \"قفل الشاشة\" للمتابعة"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"حدث خطأ، يُرجى إعادة المحاولة."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"رمز الوجه"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"قراءة إعدادات المزامنة"</string>
diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml
index 7bc8fa8bdda8..d492c7cfe930 100644
--- a/core/res/res/values-as/strings.xml
+++ b/core/res/res/values-as/strings.xml
@@ -665,6 +665,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"মুখাৱয়বৰ মডেল সৃষ্টি কৰিব নোৱাৰি। পুনৰ চেষ্টা কৰক।"</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"ডাঠ ৰঙৰ চশমা চিনাক্ত কৰা হৈছে। আপোনাৰ মুখাৱয়ব সম্পূৰ্ণৰূপে দেখা পোৱা হৈ থাকিবই লাগিব।"</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"মুখাৱয়বত আৱৰণ চিনাক্ত কৰা হৈছে। আপোনাৰ মুখাৱয়ব সম্পূৰ্ণৰূপে দেখা পোৱা হৈ থাকিবই লাগিব।"</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"মুখমণ্ডল সত্যাপন কৰিব পৰা নগ’ল। হাৰ্ডৱেৰ নাই।"</string>
<string name="face_error_timeout" msgid="2598544068593889762">"ফেচ আনলক পুনৰ ব্যৱহাৰ কৰি চাওক"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"নতুন মুখমণ্ডলৰ ডেটা জমা কৰিব পৰা নাই। প্ৰথমে পুৰণি এখন মচক।"</string>
@@ -682,6 +684,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"ফেচ আনলক অথবা স্ক্ৰীন লক ব্যৱহাৰ কৰক"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"অব্যাহত ৰাখিবলৈ নিজৰ মুখাৱয়ব ব্যৱহাৰ কৰক"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"অব্যাহত ৰাখিবলৈ আপোনাৰ মুখাৱয়ব অথবা স্ক্ৰীন লক ব্যৱহাৰ কৰক"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"কিবা ভুল হ’ল। পুনৰ চেষ্টা কৰক।"</string>
<string name="face_icon_content_description" msgid="465030547475916280">"মুখমণ্ডলৰ আইকন"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"ছিংকৰ ছেটিং পঢ়ক"</string>
diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml
index acf698542ee0..ea8addecceac 100644
--- a/core/res/res/values-az/strings.xml
+++ b/core/res/res/values-az/strings.xml
@@ -665,6 +665,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Üz modelinizi yaratmaq olmur. Yenə cəhd edin."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Tünd eynək aşkar edildi. Üzünüz tam görünməlidir."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Üz örtüyü aşkar edildi. Üzünüz tam görünməlidir."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"Üz doğrulanmadı. Avadanlıq əlçatan deyil."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Üz ilə kiliddən çıxarmanı yenidən sınayın"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"Yeni üz datası saxlanmadı. Əvvəlcə köhnə olanı silin."</string>
@@ -682,6 +684,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Üz və ya ekran kilidindən istifadə edin"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Davam etmək üçün üzünüzdən istifadə edin"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Davam etmək üçün üz və ya ekran kilidinizdən istifadə edin"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"Xəta oldu. Yenə cəhd edin."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"Üz işarəsi"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"sinx ayarlarını oxu"</string>
diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml
index 41f8ff6ab486..940b09195f07 100644
--- a/core/res/res/values-b+sr+Latn/strings.xml
+++ b/core/res/res/values-b+sr+Latn/strings.xml
@@ -666,6 +666,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Pravljenje modela lica nije uspelo. Probajte ponovo."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Otkrivene su tamne naočari. Lice mora da bude potpuno vidljivo."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Otkriveno je prekrivanje lica. Lice mora da bude potpuno vidljivo."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"Provera lica nije uspela. Hardver nije dostupan."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Probajte ponovo otključavanje licem"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"Novi podaci o licu nisu sačuvani. Prvo izbrišete prethodne."</string>
@@ -683,6 +685,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Koristite zaključavanje licem ili zaključavanje ekrana"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Potvrdite identitet licem da biste nastavili"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Koristite lice ili zaključavanje ekrana da biste nastavili"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"Došlo je do problema. Probajte ponovo."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"Ikona lica"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"čitanje podešavanja sinhronizacije"</string>
diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml
index 6b8c4d67e7ef..58e72a72f9ae 100644
--- a/core/res/res/values-be/strings.xml
+++ b/core/res/res/values-be/strings.xml
@@ -667,6 +667,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Не ўдалося стварыць мадэль твару. Паўтарыце спробу."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Выяўлены цёмныя акуляры. Твар павінен быць цалкам бачным."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Нешта засланяе твар. Твар павінен быць цалкам бачным."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"Твар не спраўджаны. Абсталяванне недаступнае."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Выканайце распазнаванне твару паўторна"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"Новыя даныя пра твар не захаваны. Спачатку выдаліце старыя."</string>
@@ -684,6 +686,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Выкарыстоўваць распазнаванне твару ці блакіроўку экрана"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Каб працягнуць, скарыстайце распазнаванне твару"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Каб працягнуць, скарыстайце распазнаванне твару ці сродак разблакіроўкі экрана"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"Нешта пайшло не так. Паўтарыце спробу."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"Значок твару"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"чытаць параметры сінхранізацыі"</string>
diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml
index 2ec969d039b3..523c8b536695 100644
--- a/core/res/res/values-bg/strings.xml
+++ b/core/res/res/values-bg/strings.xml
@@ -665,6 +665,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Моделът на лицето ви не бе създаден. Опитайте отново."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Изглежда, че носите тъмни очила. То трябва да е напълно видимо."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Изглежда, че лицето ви е покрито. То трябва да е напълно видимо."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"Лицето не може да се потвърди. Хардуерът не е налице."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Опитайте отново да отключите с лице"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"Не може да се запази ново лице. Първо изтрийте старо."</string>
@@ -682,6 +684,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Използване на отключването с лице или опцията за заключване на екрана"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Използвайте лицето си, за да продължите"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Използвайте лицето си или опцията за заключване на екрана, за да продължите"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"Нещо се обърка. Опитайте отново."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"Икона на лице"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"четене на настройките за синхронизиране"</string>
diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml
index 6ab1fa0d9d93..146fb6f3bac1 100644
--- a/core/res/res/values-bn/strings.xml
+++ b/core/res/res/values-bn/strings.xml
@@ -665,6 +665,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"ফেস মডেল তৈরি করা যাচ্ছে না। আবার চেষ্টা করুন।"</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"কালো চশমা শনাক্ত করা হয়েছে। আপনার মুখ পুরোপুরি দৃশ্যমান হতে হবে।"</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"মুখে মাস্ক শনাক্ত করা হয়েছে। আপনার মুখ পুরোপুরি দৃশ্যমান হতে হবে।"</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"ফেস যাচাই করা যায়নি। হার্ডওয়্যার উপলভ্য নেই।"</string>
<string name="face_error_timeout" msgid="2598544068593889762">"\'ফেস আনলক\' আবার ব্যবহার করার চেষ্টা করুন"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"নতুন ফেস ডেটা স্টোর করা যায়নি। প্রথমে পুরনোটি মুছে ফেলুন।"</string>
@@ -682,6 +684,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"ফেস অথবা স্ক্রিন লক ব্যবহার করুন"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"চালিয়ে যেতে আপনার মুখ ব্যবহার করুন"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"চালিয়ে যেতে আপনার ফেস বা স্ক্রিন লক ব্যবহার করুন"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"কোনও সমস্যা হয়েছে। আবার করে দেখুন।"</string>
<string name="face_icon_content_description" msgid="465030547475916280">"ফেস আইকন"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"সিঙ্ক সেটিংস পড়ে"</string>
diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml
index 941b9b4022ce..c4807fbb65c2 100644
--- a/core/res/res/values-bs/strings.xml
+++ b/core/res/res/values-bs/strings.xml
@@ -666,6 +666,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Nije moguće kreirati model lica. Pokušajte ponovo."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Otkrivene su tamne naočale. Lice se mora u potpunosti vidjeti."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Otkriveno je pokrivalo preko lica. Lice se mora u potpunosti vidjeti."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"Nije moguće potvrditi lice. Hardver nije dostupan."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Pokušajte ponovo s otključavanjem licem"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"Nije moguće sačuvati nove podatke o licu. Prvo izbrišite stare."</string>
@@ -683,6 +685,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Koristi otključavanje licem ili zaključavanje ekrana"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Koristite lice da nastavite"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Koristite lice ili zaključavanje ekrana da nastavite"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"Nešto nije uredu. Pokušajte ponovo."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"Ikona lica"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"čitanje postavki za sinhroniziranje"</string>
diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml
index ecad6b463d1e..90f2ddd9f730 100644
--- a/core/res/res/values-ca/strings.xml
+++ b/core/res/res/values-ca/strings.xml
@@ -666,6 +666,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"No es pot crear el model facial. Torna-ho a provar."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"S\'han detectat ulleres fosques. La cara ha de ser completament visible."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"S\'ha detectat una mascareta. La cara ha de ser completament visible."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"No es pot verificar la cara. Maquinari no disponible."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Torna a provar Desbloqueig facial"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"No es poden desar dades facials noves. Suprimeix-ne d\'antigues."</string>
@@ -683,6 +685,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Utilitza el desbloqueig facial o de pantalla"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Utilitza la teva cara per continuar"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Utilitza la cara o el bloqueig de pantalla per continuar"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"S\'ha produït un error. Torna-ho a provar."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"Icona facial"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"llegir la configuració de sincronització"</string>
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index 9dbb6351f8cd..9f67d084cc7f 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -667,6 +667,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Model se nepodařilo vytvořit. Zkuste to znovu."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Byly zjištěny tmavé brýle. Obličej musí být plně viditelný."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Byl zjištěn zakrytý obličej. Obličej musí být plně viditelný."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"Obličej nelze ověřit. Hardware není dostupný."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Zopakujte odemknutí obličejem"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"Údaje o novém obličeji nelze uložit. Nejdřív vymažte starý."</string>
@@ -684,6 +686,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Použít odemknutí obličejem nebo zámek obrazovky"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Pokračujte ověřením obličeje"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Pokračujte ověřením pomocí obličeje nebo zámku obrazovky"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"Došlo k chybě. Zkuste to znovu."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"Ikona obličeje"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"čtení nastavení synchronizace"</string>
diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml
index 48fcad7e8d3c..91b57d3be4a3 100644
--- a/core/res/res/values-da/strings.xml
+++ b/core/res/res/values-da/strings.xml
@@ -665,6 +665,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Din ansigtsmodel kan ikke oprettes. Prøv igen."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Mørke briller er registreret. Dit ansigt skal være helt synligt."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Ansigtsdækning er registreret. Dit ansigt skal være helt synligt."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"Ansigt ikke bekræftet. Hardware ikke tilgængelig."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Prøv ansigtslås igen"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"Der kan ikke gemmes nye ansigtsdata. Slet et gammelt først."</string>
@@ -682,6 +684,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Brug ansigts- eller skærmlås"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Brug dit ansigt for at fortsætte"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Brug din ansigts- eller skærmlås for at fortsætte"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"Noget gik galt. Prøv igen."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"Ansigt"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"læse indstillinger for synkronisering"</string>
diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml
index 3bf08bc51d81..6f16f569f62a 100644
--- a/core/res/res/values-de/strings.xml
+++ b/core/res/res/values-de/strings.xml
@@ -665,6 +665,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Dein Gesichtsmodell kann nicht erstellt werden. Versuche es noch einmal."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Dunkle Brille erkannt. Dein Gesicht muss vollständig sichtbar sein."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Dein Gesicht ist bedeckt. Es muss vollständig sichtbar sein."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"Gesicht nicht erkannt. Hardware nicht verfügbar."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Versuche es noch mal mit der Gesichtsentsperrung"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"Kein Speicherplatz frei. Bitte erst ein Gesicht löschen."</string>
@@ -682,6 +684,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Entsperrung per Gesichtserkennung oder Displaysperre verwenden"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Gesichtserkennung verwenden, um fortzufahren"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Verwende die Gesichtserkennung oder deine Display-Entsperrmethode, um fortzufahren"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"Ein Problem ist aufgetreten. Versuch es noch einmal."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"Gesichtssymbol"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"Synchronisierungseinstellungen lesen"</string>
diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml
index 121261db6f7e..e83314cae495 100644
--- a/core/res/res/values-el/strings.xml
+++ b/core/res/res/values-el/strings.xml
@@ -665,6 +665,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Αδύνατη η δημιουργία του μοντέλου προσώπου. Δοκιμάστε ξανά."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Ανιχνεύτηκαν σκούρα γυαλιά. Το πρόσωπό σας πρέπει να φαίνεται πλήρως."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Ανιχνεύτηκε κάλυμμα προσώπου. Το πρόσωπό σας πρέπει να φαίνεται πλήρως."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"Αδύν. επαλήθ. προσώπου. Μη διαθέσιμος εξοπλισμός."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Δοκιμάστε ξανά το Ξεκλείδωμα με το πρόσωπο"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"Η αποθήκ. νέων δεδομ. προσώπ. είναι αδύν. Διαγρ. ένα παλιό."</string>
@@ -682,6 +684,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Χρήση προσώπου ή κλειδώματος οθόνης"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Χρησιμοποιήστε το πρόσωπό σας για να συνεχίσετε"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Χρησιμοποιήστε το πρόσωπό σας ή το κλείδωμα οθόνης για συνέχεια"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"Παρουσιάστηκε κάποιο πρόβλημα. Δοκιμάστε ξανά."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"Εικ. προσ."</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"διαβάζει τις ρυθμίσεις συγχρονισμού"</string>
diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml
index 29de91eecf4d..d1da0fb1cf78 100644
--- a/core/res/res/values-en-rAU/strings.xml
+++ b/core/res/res/values-en-rAU/strings.xml
@@ -665,6 +665,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Can’t create your face model. Try again."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Dark glasses detected. Your face must be fully visible."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Face covering detected. Your face must be fully visible."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"Can’t verify face. Hardware not available."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Try Face Unlock again"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"Can’t store new face data. Delete an old one first."</string>
@@ -682,6 +684,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Use face or screen lock"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Use your face to continue"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Use your face or screen lock to continue"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"Something went wrong. Try again."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"Face icon"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"read sync settings"</string>
diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml
index ead5492d7afd..9ebb57bddae8 100644
--- a/core/res/res/values-en-rCA/strings.xml
+++ b/core/res/res/values-en-rCA/strings.xml
@@ -665,6 +665,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Can’t create your face model. Try again."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Dark glasses detected. Your face must be fully visible."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Face covering detected. Your face must be fully visible."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"Can’t verify face. Hardware not available."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Try Face Unlock again"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"Can’t store new face data. Delete an old one first."</string>
@@ -682,6 +684,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Use face or screen lock"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Use your face to continue"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Use your face or screen lock to continue"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"Something went wrong. Try again."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"Face icon"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"read sync settings"</string>
diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml
index 175b323d9933..861393f0d105 100644
--- a/core/res/res/values-en-rGB/strings.xml
+++ b/core/res/res/values-en-rGB/strings.xml
@@ -665,6 +665,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Can’t create your face model. Try again."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Dark glasses detected. Your face must be fully visible."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Face covering detected. Your face must be fully visible."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"Can’t verify face. Hardware not available."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Try Face Unlock again"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"Can’t store new face data. Delete an old one first."</string>
@@ -682,6 +684,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Use face or screen lock"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Use your face to continue"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Use your face or screen lock to continue"</string>
+ <string-array name="face_error_vendor">
+ </string-array>
<string name="face_error_vendor_unknown" msgid="7387005932083302070">"Something went wrong. Try again."</string>
<string name="face_icon_content_description" msgid="465030547475916280">"Face icon"</string>
<string name="permlab_readSyncSettings" msgid="6250532864893156277">"read sync settings"</string>
diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml
index 49503b3e5297..a0a9436c86db 100644
--- a/core/res/res/values-en-rIN/strings.xml
+++ b/core/res/res/values-en-rIN/strings.xml
@@ -665,6 +665,8 @@
<string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Can’t create your face model. Try again."</string>
<string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Dark glasses detected. Your face must be fully visible."</string>
<string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Face covering detected. Your face must be fully visible."</string>
+ <string-array name="face_acquired_vendor">
+ </string-array>
<string name="face_error_hw_not_available" msgid="5085202213036026288">"Can’t verify face. Hardware not available."</string>
<string name="face_error_timeout" msgid="2598544068593889762">"Try Face Unlock again"</string>
<string name="face_error_no_space" msgid="5649264057026021723">"Can’t store new face data. Delete an old one first."</string>
@@ -682,6 +684,8 @@
<string name="face_or_screen_lock_app_setting_name" msgid="1603149075605709106">"Use face or screen lock"</string>
<string name="face_dialog_default_subtitle" msgid="6620492813371195429">"Use your face to continue"</string>
<string name="face_or_screen_lock_dialog_default_subtitle" msgid="5006381531158341844">"Use your face or screen lock to continue"</string>
+ <string-array name="face_error_vendor">
+ </string-array>