Snap for 10243937 from e215ee0263a075b1d1724fb1baca1c71f0e26eac to aml-frc-releasefrc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110

Change-Id: Ic80cd2a30f307308c091632b2d3b5c1c75801f2a

12 files changed, 7 insertions, 57 deletions

diff --git a/private/property.te b/private/property.te
deleted file mode 100644
index a6bee3b..0000000
--- a/private/property.te
+++ /dev/null
@@ -1,8 +0,0 @@
-product_restricted_prop(masterclear_esim_prop)
-product_restricted_prop(euicc_seamless_transfer_prop)
-
-neverallow { domain -init } masterclear_esim_prop:property_service set;
-neverallow { domain -init } euicc_seamless_transfer_prop:property_service set;
-
-get_prop(appdomain, masterclear_esim_prop)
-get_prop(appdomain, euicc_seamless_transfer_prop)
diff --git a/private/property_contexts b/private/property_contexts
index c7321c0..abcdd41 100644
--- a/private/property_contexts
+++ b/private/property_contexts
@@ -3,7 +3,3 @@ persist.bootanim.color1     u:object_r:bootanim_system_prop:s0     exact    int
 persist.bootanim.color2     u:object_r:bootanim_system_prop:s0     exact    int
 persist.bootanim.color3     u:object_r:bootanim_system_prop:s0     exact    int
 persist.bootanim.color4     u:object_r:bootanim_system_prop:s0     exact    int
-
-#eSIM
-masterclear.allow_retain_esim_profiles_after_fdr     u:object_r:masterclear_esim_prop:s0     exact     bool
-euicc.seamless_transfer_enabled_in_non_qs     u:object_r:euicc_seamless_transfer_prop:s0     exact     bool
diff --git a/whitechapel_pro/certs/EuiccGoogle.x509.pem b/whitechapel_pro/certs/EuiccGoogle.x509.pem
deleted file mode 100644
index be6c715..0000000
--- a/whitechapel_pro/certs/EuiccGoogle.x509.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDwzCCAqugAwIBAgIJAOZ2d46ckK9JMA0GCSqGSIb3DQEBCwUAMHgxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1Nb3VudGFpbiBW
-aWV3MRQwEgYDVQQKDAtHb29nbGUgSW5jLjEQMA4GA1UECwwHQW5kcm9pZDEUMBIG
-A1UEAwwLRXVpY2NHb29nbGUwHhcNMTYxMjE3MDEyMTEzWhcNNDQwNTA0MDEyMTEz
-WjB4MQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwN
-TW91bnRhaW4gVmlldzEUMBIGA1UECgwLR29vZ2xlIEluYy4xEDAOBgNVBAsMB0Fu
-ZHJvaWQxFDASBgNVBAMMC0V1aWNjR29vZ2xlMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEA1S7b8bGk4fNm3cckWJx2sbnvC39BroHNwk6am6jVP4MZAYuc
-PN6QQ7/2s7hvtn91w6VbeGi2fryIMc7jXjlixheotD2Ns+/7qsPpQ+ZovfaQO5Xw
-/c4J+1CfiqrLtd4TyO+4uFGTCO/vs4qhMH58QrhnYPZUqeuq0Zs1Irp0FlVFe1qm
-1heU2zJy5locjb9UJXY33sVc9vfWy+sM8TLX40nWxIXGdbzJHJNyjjr/NA+0+drx
-anJCtac6+evehH6o8+t8RQBU44PEZiyGkM8poNgRTAcFdRFXU8pitZXp3QZQk6HO
-JsVuqqADwsfxGSdVyHFmOW7gxpkB9+IuJJEmkQIDAQABo1AwTjAdBgNVHQ4EFgQU
-lVkGDn/XmF7HjP0K3ykCNnnZ8jMwHwYDVR0jBBgwFoAUlVkGDn/XmF7HjP0K3ykC
-NnnZ8jMwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAkDOpQMXcuKwt
-CPu5/tdskpfoBMrpYJOwfvpj/JwrudnXUHZXnBnH9PtHprghGtNiWPXHTbZSzKUS
-Aojpo1Lev7DtowFILA54oY6d1NqbCIJy+Knwt3W5H7Rg8u8LqvzkpX5CBKAhRwkQ
-0t3yrlEkI7kx805vg484gAe+AXyBx0dGe6ov4/yrzv9E+1jhIgP7tF/f+x8zX6Tr
-mDCjzz4mgKahMbmsHQg430wlbZczrciMMfPiRc3xEHKLUqGL0ARtE01hJiJ4TY/X
-iL/8QUA3nBcpUyEwHFwUao40Gjca9xteKd7MtmiZ6BM2JJSQ4nSNkcwQW8PU/7Qb
-0QMwPRPLbQ==
------END CERTIFICATE-----
diff --git a/whitechapel_pro/dump_power_gs201.te b/whitechapel_pro/dump_power_gs201.te
index 44520b0..b61001c 100644
--- a/whitechapel_pro/dump_power_gs201.te
+++ b/whitechapel_pro/dump_power_gs201.te
@@ -24,6 +24,7 @@ userdebug_or_eng(`
   allow dump_power_gs201 vendor_charger_debugfs:file r_file_perms;
   allow dump_power_gs201 vendor_pm_genpd_debugfs:file r_file_perms;
   allow dump_power_gs201 vendor_maxfg_debugfs:dir r_dir_perms;
+  allow dump_power_gs201 vendor_maxfg_debugfs:file r_file_perms;
   allow dump_power_gs201 vendor_votable_debugfs:dir r_dir_perms;
   allow dump_power_gs201 vendor_votable_debugfs:file r_file_perms;
 ')
diff --git a/whitechapel_pro/euicc_app.te b/whitechapel_pro/euicc_app.te
deleted file mode 100644
index 2e36435..0000000
--- a/whitechapel_pro/euicc_app.te
+++ /dev/null
@@ -1,13 +0,0 @@
-type euicc_app, domain;
-app_domain(euicc_app)
-net_domain(euicc_app)
-
-allow euicc_app app_api_service:service_manager find;
-allow euicc_app radio_service:service_manager find;
-allow euicc_app cameraserver_service:service_manager find;
-
-get_prop(euicc_app, camera_config_prop)
-get_prop(euicc_app, setupwizard_esim_prop)
-get_prop(euicc_app, bootloader_prop)
-get_prop(euicc_app, exported_default_prop)
-get_prop(euicc_app, vendor_modem_prop)
diff --git a/whitechapel_pro/genfs_contexts b/whitechapel_pro/genfs_contexts
index 902584c..57f0237 100644
--- a/whitechapel_pro/genfs_contexts
+++ b/whitechapel_pro/genfs_contexts
@@ -183,6 +183,8 @@ genfscon sysfs /devices/platform/14700000.ufs/rev                       u:object
 
 # debugfs
 genfscon debugfs /maxfg                                                 u:object_r:vendor_maxfg_debugfs:s0
+genfscon debugfs /maxfg_base                                            u:object_r:vendor_maxfg_debugfs:s0
+genfscon debugfs /maxfg_secondary                                       u:object_r:vendor_maxfg_debugfs:s0
 genfscon debugfs /pm_genpd/pm_genpd_summary                             u:object_r:vendor_pm_genpd_debugfs:s0
 genfscon debugfs /regmap                                                u:object_r:vendor_regmap_debugfs:s0
 genfscon debugfs /usb                                                   u:object_r:vendor_usb_debugfs:s0
@@ -214,6 +216,7 @@ genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/7-0050/eeprom
 genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-7/i2c-p9412/power_supply    u:object_r:sysfs_batteryinfo:s0
 genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/8-0050/eeprom             u:object_r:sysfs_batteryinfo:s0
 genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-8/i2c-p9412/power_supply    u:object_r:sysfs_batteryinfo:s0
+genfscon sysfs /devices/platform/10da0000.hsi2c/i2c-9/9-0050/eeprom             u:object_r:sysfs_batteryinfo:s0
 genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-2/2-0069/power_supply       u:object_r:sysfs_batteryinfo:s0
 genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-3/3-0069/power_supply       u:object_r:sysfs_batteryinfo:s0
 genfscon sysfs /devices/platform/10d60000.hsi2c/i2c-4/4-0069/power_supply       u:object_r:sysfs_batteryinfo:s0
diff --git a/whitechapel_pro/keys.conf b/whitechapel_pro/keys.conf
index 187184a..54130ea 100644
--- a/whitechapel_pro/keys.conf
+++ b/whitechapel_pro/keys.conf
@@ -15,6 +15,3 @@ ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/camera_eng.x509.pem
 
 [@CAMERAFISHFOOD]
 ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/camera_fishfood.x509.pem
-
-[@EUICCGOOGLE]
-ALL : device/google/gs201-sepolicy/whitechapel_pro/certs/EuiccGoogle.x509.pem
diff --git a/whitechapel_pro/mac_permissions.xml b/whitechapel_pro/mac_permissions.xml
index 24d88e6..b57e61c 100644
--- a/whitechapel_pro/mac_permissions.xml
+++ b/whitechapel_pro/mac_permissions.xml
@@ -39,7 +39,4 @@
     <signer signature="@CAMERAFISHFOOD" >
       <seinfo value="CameraFishfood" />
     </signer>
-    <signer signature="@EUICCGOOGLE" >
-      <seinfo value="EuiccGoogle" />
-    </signer>
 </policy>
diff --git a/whitechapel_pro/pixelstats_vendor.te b/whitechapel_pro/pixelstats_vendor.te
index 48fd6e8..6aba16a 100644
--- a/whitechapel_pro/pixelstats_vendor.te
+++ b/whitechapel_pro/pixelstats_vendor.te
@@ -41,6 +41,7 @@ allow pixelstats_vendor sysfs_exynos_pcie_stats:file rw_file_perms;
 #perf-metrics
 r_dir_file(pixelstats_vendor, sysfs_vendor_metrics)
 allow pixelstats_vendor sysfs_vendor_metrics:lnk_file r_file_perms;
+allow pixelstats_vendor sysfs_vendor_metrics:file w_file_perms;
 
 # BCL
 allow pixelstats_vendor sysfs_bcl:dir search;
diff --git a/whitechapel_pro/property_contexts b/whitechapel_pro/property_contexts
index 08eb601..947adf2 100644
--- a/whitechapel_pro/property_contexts
+++ b/whitechapel_pro/property_contexts
@@ -83,6 +83,7 @@ vendor.gps.                                u:object_r:vendor_gps_prop:s0
 persist.vendor.gps.                        u:object_r:vendor_gps_prop:s0
 
 # Fingerprint
+persist.vendor.fingerprint.                u:object_r:vendor_fingerprint_prop:s0
 vendor.fingerprint.                        u:object_r:vendor_fingerprint_prop:s0
 vendor.gf.                                 u:object_r:vendor_fingerprint_prop:s0
 
diff --git a/whitechapel_pro/seapp_contexts b/whitechapel_pro/seapp_contexts
index b91b1a0..149e228 100644
--- a/whitechapel_pro/seapp_contexts
+++ b/whitechapel_pro/seapp_contexts
@@ -49,9 +49,6 @@ user=_app isPrivApp=true seinfo=uwb name=com.qorvo.uwb.vendorservice domain=uwb_
 # Domain for EuiccSupportPixel
 user=_app isPrivApp=true seinfo=EuiccSupportPixel name=com.google.euiccpixel domain=euiccpixel_app type=app_data_file levelFrom=all
 
-# Domain for EuiccGoogle
-user=_app isPrivApp=true seinfo=EuiccGoogle name=com.google.android.euicc domain=euicc_app type=app_data_file levelFrom=all
-
 # Sub System Ramdump
 user=system seinfo=platform name=com.google.SSRestartDetector domain=ssr_detector_app type=system_app_data_file levelFrom=user
 
diff --git a/whitechapel_pro/vendor_init.te b/whitechapel_pro/vendor_init.te
index 4d8516a..415d7c8 100644
--- a/whitechapel_pro/vendor_init.te
+++ b/whitechapel_pro/vendor_init.te
@@ -37,6 +37,7 @@ allow vendor_init proc_watermark_scale_factor:file w_file_perms;
 
 # Trusty storage FS ready
 get_prop(vendor_init, vendor_trusty_storage_prop)
+allow vendor_init tee_data_file:lnk_file read;
 
 # Mali
 set_prop(vendor_init, vendor_arm_runtime_option_prop)