Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 8649577 from 38d2997f6a to tm-release

Browse source 
Change-Id: I246fc862e0a8c7ade790aecf4dd6c2310b7368ab
This commit is contained in:
Android Build Coastguard Worker 2022-05-26 23:02:21 +00:00
commit aeefc0b25a
2 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
conf/init.gs101.rc
View file

@ -985,10 +985,19 @@ on property:vendor.thermal.link_ready=1
chown system system /dev/thermal/cdev-by-name/wlc_fcc/cur_state chown system system /dev/thermal/cdev-by-name/wlc_fcc/cur_state
chown system system /dev/thermal/cdev-by-name/usbc-port/cur_state chown system system /dev/thermal/cdev-by-name/usbc-port/cur_state
# Create thermal symlink in off charging mode
on charger on charger
mkdir /dev/thermal 0750 system system
mkdir /dev/thermal/tz-by-name 0750 system system
mkdir /dev/thermal/cdev-by-name 0750 system system
start vendor.thermal.symlinks
write /proc/vendor_sched/sys_uclamp_min 0 write /proc/vendor_sched/sys_uclamp_min 0
write /proc/vendor_sched/sys_prefer_idle 0 write /proc/vendor_sched/sys_prefer_idle 0
# Launch thermal hal in off charging mode
on charger && property:vendor.thermal.link_ready=1
start vendor.thermal-hal-2-0
on property:vendor.disable.bcl.control=1 on property:vendor.disable.bcl.control=1
write /sys/devices/virtual/pmic/mitigation/instruction/enable_mitigation 0 write /sys/devices/virtual/pmic/mitigation/instruction/enable_mitigation 0

31
usb/usb/Usb.cpp
View file

@ -83,23 +83,39 @@ ScopedAStatus Usb::enableUsbData(const string& in_portName, bool in_enable,
int64_t in_transactionId) { int64_t in_transactionId) {
bool result = true; bool result = true;
std::vector<PortStatus> currentPortStatus; std::vector<PortStatus> currentPortStatus;
string pullup;
ALOGI("Userspace turn %s USB data signaling. opID:%ld", in_enable ? "on" : "off", ALOGI("Userspace turn %s USB data signaling. opID:%ld", in_enable ? "on" : "off",
in_transactionId); in_transactionId);
if (in_enable) { if (in_enable) {
if (!mUsbDataEnabled) { if (!mUsbDataEnabled) {
if (ReadFileToString(PULLUP_PATH, &pullup)) {
pullup = Trim(pullup);
if (pullup != kGadgetName) {
if (!WriteStringToFile(kGadgetName, PULLUP_PATH)) {
ALOGE("Gadget cannot be pulled up");
result = false;
}
}
}
if (!WriteStringToFile("1", USB_DATA_PATH)) { if (!WriteStringToFile("1", USB_DATA_PATH)) {
ALOGE("Not able to turn on usb connection notification"); ALOGE("Not able to turn on usb connection notification");
result = false; result = false;
} }
if (!WriteStringToFile(kGadgetName, PULLUP_PATH)) {
ALOGE("Gadget cannot be pulled up");
result = false;
}
} }
} else { } else {
if (ReadFileToString(PULLUP_PATH, &pullup)) {
pullup = Trim(pullup);
if (pullup == kGadgetName) {
if (!WriteStringToFile("none", PULLUP_PATH)) {
ALOGE("Gadget cannot be pulled down");
result = false;
}
}
}
if (!WriteStringToFile("1", ID_PATH)) { if (!WriteStringToFile("1", ID_PATH)) {
ALOGE("Not able to turn off host mode"); ALOGE("Not able to turn off host mode");
result = false; result = false;
@ -114,11 +130,6 @@ ScopedAStatus Usb::enableUsbData(const string& in_portName, bool in_enable,
ALOGE("Not able to turn on usb connection notification"); ALOGE("Not able to turn on usb connection notification");
result = false; result = false;
} }
if (!WriteStringToFile("none", PULLUP_PATH)) {
ALOGE("Gadget cannot be pulled down");
result = false;
}
} }
if (result) { if (result) {