Snap for 11967491 from a9b7137ea9
to 24Q3-release
Change-Id: I033bb919c5dc1fb879e77b5e03b01b819c5f111c
This commit is contained in:
commit
0562582075
3 changed files with 7 additions and 2 deletions
|
@ -361,7 +361,7 @@ PRODUCT_COPY_FILES += \
|
|||
device/google/zuma/conf/init.zuma.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.rc \
|
||||
device/google/zuma/conf/init.persist.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.persist.rc
|
||||
|
||||
ifeq (true,$(PRODUCT_16K_DEVELOPER_OPTION))
|
||||
ifeq (true,$(filter $(DEVICE_PAGE_AGNOSTIC) $(PRODUCT_16K_DEVELOPER_OPTION),true))
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/zuma/conf/init.efs.16k.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.efs.rc \
|
||||
device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.efs.from_data:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.efs.from_data \
|
||||
|
|
|
@ -130,7 +130,8 @@ const struct SysfsCollector::SysfsPaths sysfs_paths = {
|
|||
"/sys/devices/platform/hdcp/hdcp1_success_count",
|
||||
"/sys/devices/platform/hdcp/hdcp1_fail_count",
|
||||
"/sys/devices/platform/hdcp/hdcp0_count",
|
||||
}
|
||||
},
|
||||
.SpeakerVersionPath = "/sys/devices/platform/audiometrics/speaker_version"
|
||||
};
|
||||
|
||||
const struct UeventListener::UeventPaths ueventPaths = {
|
||||
|
|
|
@ -602,6 +602,10 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role
|
|||
fp = fopen(filename.c_str(), "w");
|
||||
if (fp != NULL) {
|
||||
int ret = fputs(convertRoletoString(in_role).c_str(), fp);
|
||||
if (ret == EAGAIN) {
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(700));
|
||||
ret = fputs(convertRoletoString(in_role).c_str(), fp);
|
||||
}
|
||||
fclose(fp);
|
||||
if ((ret != EOF) && ReadFileToString(filename, &written)) {
|
||||
written = Trim(written);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue