Evolution-X-Devices/device_google_sunfish
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add vendor prop to disable moisture detection.

Browse Source 
setprop vendor.usb.contaminantdisable true
disable contaminant detection.

Bug: 130175818
Test: setprop vendor.usb.contaminantdisable true

Change-Id: I9c9faa219cfae05431db8b0f1bec173c24c0d437
(cherry picked from commit 21e7d5aec7e3e5b9b032b71a3153310376a46ae2)
This commit is contained in:
Badhri Jagan Sridharan
2019-04-08 15:40:43 -07:00
committed by Cyan_Hsieh
parent 9b4f79057d
commit c765ae8150
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
init.hardware.usb.rc
View File

@@ -58,6 +58,9 @@ on early-boot
on property:init.svc.console=running
write /sys/class/power_supply/usb/moisture_detection_enabled 0
on property:vendor.usb.contaminantdisable=true
write /sys/class/power_supply/usb/moisture_detection_enabled 0
on boot
setprop sys.usb.configfs 2

10
usb/Usb.cpp
View File

@@ -49,6 +49,8 @@ volatile bool destroyThread;
constexpr char kEnabledPath[] = "/sys/class/power_supply/usb/moisture_detection_enabled";
constexpr char kDetectedPath[] = "/sys/class/power_supply/usb/moisture_detected";
constexpr char kConsole[] = "init.svc.console";
constexpr char kDisableContatminantDetection[] = "vendor.usb.contaminantdisable";
void queryVersionHelper(android::hardware::usb::V1_2::implementation::Usb *usb,
hidl_vec<PortStatus> *currentPortStatus_1_2);
@@ -132,8 +134,12 @@ Status queryMoistureDetectionStatus(hidl_vec<PortStatus> *currentPortStatus_1_2)
Return<void> Usb::enableContaminantPresenceDetection(const hidl_string & /*portName*/,
bool enable) {
std::string status = GetProperty("init.svc.console", "");
if (status != "running")
std::string status = GetProperty(kConsole, "");
std::string disable = GetProperty(kDisableContatminantDetection, "");
if (status != "running" && disable != "true")
writeFile(kEnabledPath, enable ? "1" : "0");
hidl_vec<PortStatus> currentPortStatus_1_2;