diff options
| author | George Chang <georgekgchang@google.com> | 2020-02-19 22:33:36 +0800 |
|---|---|---|
| committer | George Chang <georgekgchang@google.com> | 2020-02-19 22:33:36 +0800 |
| commit | 5da9750e8d70e8e3db7d6e54741ae64f55319bd4 (patch) | |
| tree | cea1bbd6d029a1fd1eb17fb9c359a4273bfa5243 /init.hardware.rc | |
| parent | 73e0f7dc00fcf9a8bc29188750a776d2bfe2b465 (diff) | |
| parent | 1063573c5b3e553e2d919d64c2db5882f84c1521 (diff) | |
resolve merge conflicts of 1063573c5b3e553e2d919d64c2db5882f84c1521 to master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I4d41f42d993e1480d53f38a55e89da5992e65b4e
Diffstat (limited to 'init.hardware.rc')
| -rw-r--r-- | init.hardware.rc | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/init.hardware.rc b/init.hardware.rc index 1f1b517c..051dea16 100644 --- a/init.hardware.rc +++ b/init.hardware.rc @@ -790,31 +790,12 @@ on property:wlan.driver.status=ok # Get the wlan driver/fw version start vendor.wlan_sh -on property:ro.boot.hardware.sku=G020A - setprop persist.vendor.nfc.uicc_enabled true - setprop persist.vendor.radio.uicc_se_enabled true -on property:ro.boot.hardware.sku=G020B - setprop persist.vendor.nfc.uicc_enabled true - setprop persist.vendor.radio.uicc_se_enabled true -on property:ro.boot.hardware.sku=G020C - setprop persist.vendor.nfc.uicc_enabled true - setprop persist.vendor.radio.uicc_se_enabled true +on property:ro.boot.mode=sota + setprop ro.boot.sota enabled + on property:ro.boot.hardware.sku=G020D - setprop persist.vendor.nfc.uicc_enabled false - setprop persist.vendor.radio.uicc_se_enabled true start vendor.secure_element_hal_service_1_1 -on property:ro.boot.hardware.sku=G020E - setprop persist.vendor.nfc.uicc_enabled true - setprop persist.vendor.radio.uicc_se_enabled true -on property:ro.boot.hardware.sku=G020F - setprop persist.vendor.nfc.uicc_enabled true - setprop persist.vendor.radio.uicc_se_enabled true -on property:ro.boot.hardware.sku=G020G - setprop persist.vendor.nfc.uicc_enabled true - setprop persist.vendor.radio.uicc_se_enabled true on property:ro.boot.hardware.sku=G020H - setprop persist.vendor.nfc.uicc_enabled false - setprop persist.vendor.radio.uicc_se_enabled true start vendor.secure_element_hal_service_1_1 # charger driver exposes now finer grain control, map demo mode to those properties |