commit 424d7d3d97d0221786ac44fde2d9a5ce11db6446
author Jenny Ho <hsiufangho@google.com> Sat Dec 12 01:04:17 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 12 01:04:17 2020 +0000
tree ff35ac6695fa2c5b9882c7dc17aa586cd5245ee2
parent 7eb929be49122a8bf10ce3545a1382f49b92aee5
parent af1711b4cc752b6afbb658eef6722412046d8a15

Merge "dumpstate: Support dump TEMP/TRICKLE/DWELL-DEFEND setting" into rvc-qpr-dev

component-overrides.xml

diff --git a/component-overrides.xml b/component-overrides.xml
index bb3419d..c682a7b 100644
--- a/component-overrides.xml
+++ b/component-overrides.xml
@@ -17,4 +17,7 @@
     <component-override package="com.android.bluetooth" >
         <component class=".sap.SapService" enabled="true" />
     </component-override>
-</config>
\ No newline at end of file
+    <component-override package="com.google.android.apps.tips" >
+        <component class=".TipsMain" enabled="true" />
+    </component-override>
+</config>

init.hardware.rc

diff --git a/init.hardware.rc b/init.hardware.rc
index 90001bb..08a73e1 100644
--- a/init.hardware.rc
+++ b/init.hardware.rc
@@ -181,6 +181,9 @@
     # Charge stats (write 0)
     chown system system /sys/class/power_supply/battery/charge_stats
 
+    # NFC streset tool name
+    setprop persist.vendor.nfc.streset libstreset
+
 # b/134578585
 on charger
     trigger fs