From e82e07a479112e5f4b903ffdb63fd4920645306c Mon Sep 17 00:00:00 2001
From: Jonathan Klee <jonathan.klee@e.email>
Date: Fri, 1 Apr 2022 09:34:07 +0200
Subject: [PATCH 1/2] Update GS290 build fingerprint

Update the build fingerprint to the one associated to the
2021-12-05 security patch level.
---
 play-services-core/src/main/res/xml/profile_gs290_eea_29.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/play-services-core/src/main/res/xml/profile_gs290_eea_29.xml b/play-services-core/src/main/res/xml/profile_gs290_eea_29.xml
index f8950e5e3..f4da4967c 100644
--- a/play-services-core/src/main/res/xml/profile_gs290_eea_29.xml
+++ b/play-services-core/src/main/res/xml/profile_gs290_eea_29.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <profile name="Gigaset 290 (Android 10.0)" device="GS290" sdk="29" id="GS290_29" auto="true">
-    <data key="Build.FINGERPRINT" value="Gigaset/GS290_EEA/GS290:10/QP1A.190711.020/1597810494:user/release-keys" />
+    <data key="Build.FINGERPRINT" value="Gigaset/GS290_EEA/GS290:10/QP1A.190711.020/1638417224:user/release-keys" />
 </profile>
-- 
GitLab


From 1c90befae4e137f91faca16948521e930ee2fbb2 Mon Sep 17 00:00:00 2001
From: Jonathan Klee <jonathan.klee@e.email>
Date: Fri, 1 Apr 2022 09:37:32 +0200
Subject: [PATCH 2/2] Remove our device build fingerprints

Remove them from GmsCore since we moved them to
ih8sn configuration.

There is an exception for GS290 where ih8sn makes device
crash/boot into recovery when setting the build fingerprint at
init. Related to GSI image ?
---
 .../src/main/res/xml/profile_fp3_29.xml       | 30 -------------------
 .../src/main/res/xml/profile_fp3_30.xml       | 30 -------------------
 .../src/main/res/xml/profile_fp4eea_30.xml    | 29 ------------------
 .../res/xml/profile_lineage_emerald_30.xml    |  5 ----
 .../src/main/res/xml/profile_starlte_27.xml   |  5 ----
 5 files changed, 99 deletions(-)
 delete mode 100644 play-services-core/src/main/res/xml/profile_fp3_29.xml
 delete mode 100644 play-services-core/src/main/res/xml/profile_fp3_30.xml
 delete mode 100644 play-services-core/src/main/res/xml/profile_fp4eea_30.xml
 delete mode 100644 play-services-core/src/main/res/xml/profile_lineage_emerald_30.xml
 delete mode 100644 play-services-core/src/main/res/xml/profile_starlte_27.xml

diff --git a/play-services-core/src/main/res/xml/profile_fp3_29.xml b/play-services-core/src/main/res/xml/profile_fp3_29.xml
deleted file mode 100644
index d2690e122..000000000
--- a/play-services-core/src/main/res/xml/profile_fp3_29.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<profile name="Fairphone 3 (Android 10.0.0)" device="FP3" sdk="29" id="FP3_29" auto="true">
-
-    <data key="Build.BOARD" value="FP3" />
-    <data key="Build.BOOTLOADER" value="8901.3.A.0132.20211027" />
-    <data key="Build.BRAND" value="Fairphone" />
-    <data key="Build.CPU_ABI" value="arm64-v8a" />
-    <data key="Build.CPU_ABI2" value="" />
-    <data key="Build.DEVICE" value="FP3" />
-    <data key="Build.DISPLAY" value="8901.3.A.0132.20211027" />
-    <data key="Build.FINGERPRINT" value="Fairphone/FP3/FP3:10/8901.3.A.0135.20211222/gms-3e31ddee:user/release-keys" />
-    <data key="Build.HARDWARE" value="qcom" />
-    <data key="Build.HOST" value="jenkins-slave-03" />
-    <data key="Build.ID" value="8901.3.A.0132.20211027" />
-    <data key="Build.MANUFACTURER" value="Fairphone" />
-    <data key="Build.MODEL" value="FP3" />
-    <data key="Build.PRODUCT" value="FP3" />
-    <data key="Build.TAGS" value="release-keys" />
-    <data key="Build.TYPE" value="user" />
-    <data key="Build.USER" value="jenkins" />
-    <data key="Build.VERSION.CODENAME" value="REL" />
-    <data key="Build.VERSION.INCREMENTAL" value="gms-30a0980c" />
-    <data key="Build.VERSION.RELEASE" value="10" />
-    <data key="Build.VERSION.SDK" value="29" />
-    <data key="Build.VERSION.SDK_INT" value="29" />
-    <data key="Build.SUPPORTED_ABIS" value="arm64-v8a,armeabi-v7a,armeabi" />
-
-    <serial template="005b56ffff999999" />
-</profile>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/xml/profile_fp3_30.xml b/play-services-core/src/main/res/xml/profile_fp3_30.xml
deleted file mode 100644
index 974f34181..000000000
--- a/play-services-core/src/main/res/xml/profile_fp3_30.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<profile name="Fairphone 3 (Android 11.0.0)" device="FP3" sdk="30" id="FP3_30" auto="true">
-
-    <data key="Build.BOARD" value="FP3" />
-    <data key="Build.BOOTLOADER" value="8901.3.A.0132.20211027" />
-    <data key="Build.BRAND" value="Fairphone" />
-    <data key="Build.CPU_ABI" value="arm64-v8a" />
-    <data key="Build.CPU_ABI2" value="" />
-    <data key="Build.DEVICE" value="FP3" />
-    <data key="Build.DISPLAY" value="8901.3.A.0132.20211027" />
-    <data key="Build.FINGERPRINT" value="Fairphone/FP3/FP3:10/8901.3.A.0132.20211027/gms-30a0980c:user/release-keys" />
-    <data key="Build.HARDWARE" value="qcom" />
-    <data key="Build.HOST" value="jenkins-slave-03" />
-    <data key="Build.ID" value="8901.3.A.0132.20211027" />
-    <data key="Build.MANUFACTURER" value="Fairphone" />
-    <data key="Build.MODEL" value="FP3" />
-    <data key="Build.PRODUCT" value="FP3" />
-    <data key="Build.TAGS" value="release-keys" />
-    <data key="Build.TYPE" value="user" />
-    <data key="Build.USER" value="jenkins" />
-    <data key="Build.VERSION.CODENAME" value="REL" />
-    <data key="Build.VERSION.INCREMENTAL" value="gms-30a0980c" />
-    <data key="Build.VERSION.RELEASE" value="11" />
-    <data key="Build.VERSION.SDK" value="30" />
-    <data key="Build.VERSION.SDK_INT" value="30" />
-    <data key="Build.SUPPORTED_ABIS" value="arm64-v8a,armeabi-v7a,armeabi" />
-
-    <serial template="005b56ffff999999" />
-</profile>
diff --git a/play-services-core/src/main/res/xml/profile_fp4eea_30.xml b/play-services-core/src/main/res/xml/profile_fp4eea_30.xml
deleted file mode 100644
index f49a1759a..000000000
--- a/play-services-core/src/main/res/xml/profile_fp4eea_30.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<profile name="Fairphone 4 (Android 11.0.0)" device="FP4" sdk="30" id="FP4_30" auto="true">
-
-    <data key="Build.BOOTLOADER" value="unknown" />
-    <data key="Build.BRAND" value="Fairphone" />
-    <data key="Build.CPU_ABI" value="arm64-v8a" />
-    <data key="Build.CPU_ABI2" value="" />
-    <data key="Build.DEVICE" value="FP4" />
-    <data key="Build.DISPLAY" value="FP4.FP3Q.A.094.20211213" />
-    <data key="Build.FINGERPRINT" value="Fairphone/FP4eea/FP4:11/RKQ1.210503.001/FP3Q:user/release-keys" />
-    <data key="Build.HARDWARE" value="qcom" />
-    <data key="Build.HOST" value="T2M-54013" />
-    <data key="Build.ID" value="RKQ1.210503.001" />
-    <data key="Build.MANUFACTURER" value="Fairphone" />
-    <data key="Build.MODEL" value="FP4" />
-    <data key="Build.PRODUCT" value="FP4eea" />
-    <data key="Build.TAGS" value="release-keys" />
-    <data key="Build.TIME" value="1637205244" />
-    <data key="Build.TYPE" value="user" />
-    <data key="Build.USER" value="android-bld" />
-    <data key="Build.VERSION.CODENAME" value="REL" />
-    <data key="Build.VERSION.INCREMENTAL" value="FP3Q" />
-    <data key="Build.VERSION.RELEASE" value="11" />
-    <data key="Build.VERSION.SDK" value="30" />
-    <data key="Build.VERSION.SDK_INT" value="30" />
-    <data key="Build.SUPPORTED_ABIS" value="arm64-v8a,armeabi-v7a,armeabi" />
-
-</profile>
diff --git a/play-services-core/src/main/res/xml/profile_lineage_emerald_30.xml b/play-services-core/src/main/res/xml/profile_lineage_emerald_30.xml
deleted file mode 100644
index 78eabe575..000000000
--- a/play-services-core/src/main/res/xml/profile_lineage_emerald_30.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<profile name="Teracube 2e (Android 11.0)" device="emerald" sdk="30" id="emerald" auto="true">
-    <data key="Build.FINGERPRINT" value="Teracube/Teracube_2e/Teracube_2e:11/RP1A.200720.011/202111011925:user/release-keys"/>
-</profile>
diff --git a/play-services-core/src/main/res/xml/profile_starlte_27.xml b/play-services-core/src/main/res/xml/profile_starlte_27.xml
deleted file mode 100644
index 85d574d9a..000000000
--- a/play-services-core/src/main/res/xml/profile_starlte_27.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<profile name="Samsung Galaxy S9 (Android 10.0)" device="starlte" sdk="27" id="starlte" auto="true">
-    <data key="Build.FINGERPRINT" value="samsung/starltexx/starlte:10/QP1A.190711.020/G960FXXSHFUJ2:user/release-keys"/>
-</profile>
-- 
GitLab