Snap for 8781324 from f174eebb89 to udc-release

Change-Id: Ib03cb8bd0214fedf481925134d3f6f41c4ab204b

audio/tangorpro/config/mixer_paths.xml

@@ -740,8 +740,7 @@
     </path>
 
     <path name="speaker-safe">
-        <ctl name="R Boost Peak Current Limit" value="3.50A"/>
-        <ctl name="R Main AMP Enable Switch" value="1"/>
+        <path name="speaker"/>
     </path>
 
     <!-- Tx device -->

conf/init.tangorpro.rc

@@ -5,6 +5,8 @@ on init
     # NFC streset tool name
     setprop persist.vendor.nfc.streset libstreset21
     setprop persist.vendor.se.streset libstreset21
+    # Load FPC's internal lib
+    setprop ro.hardware.fingerprint "fpc"
 
 # When ro.build.flavor=factory_tangorpro-userdebug, add vendor/bin/factory to default path
 on init && property:ro.build.flavor=factory_tangorpro-userdebug
@@ -58,8 +60,12 @@ on property:vendor.all.modules.ready=1 && property:persist.sys.tap_gesture=0
 
 # Fingerprint
 on post-fs-data
-    chown system system /dev/goodix_fp
-    exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g7.app
+    # Fingerprint
+    chown system system /sys/devices/platform/odm/odm:fp_fpc1020/clk_enable
+    chown system system /sys/devices/platform/odm/odm:fp_fpc1020/hw_reset
+    chown system system /sys/devices/platform/odm/odm:fp_fpc1020/irq
+    chown system system /sys/devices/platform/odm/odm:fp_fpc1020/wakeup_enable
+    exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/1540.app
 
 # Wifi
 on post-fs-data

device-tangorpro.mk

@@ -128,14 +128,9 @@ include device/google/tangorpro/bluetooth/syna_default.mk
 # 	ro.hardware.keystore=software \
 # 	ro.hardware.gatekeeper=software
 
-## Fingerprint HAL
-#GOODIX_CONFIG_BUILD_VERSION := g7_trusty
-#include device/google/gs101/fingerprint/udfps_common.mk
-#ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
-#include device/google/gs101/fingerprint/udfps_shipping.mk
-#else
-#include device/google/gs101/fingerprint/udfps_factory.mk
-#endif
+# Fingerprint
+include device/google/gs101/fingerprint/fpc1540/sw42/fpc1540.mk
+FPC_MODULE_TYPE=1542_S
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts