From 06d178344e997dce553771e89bbfd40dad1bb91d Mon Sep 17 00:00:00 2001 From: "GOOGLE\\huangaustin" Date: Thu, 14 Apr 2022 11:32:33 +0800 Subject: [PATCH 1/3] [PixelLogger][P22] Update P22 Pixel_default.nprf for L1 bug: 214351205 Change-Id: I003f7f3d8cd902f53d4f119836689abad0b0dc34 --- radio/config/Pixel_Default.nprf | Bin 8789 -> 8879 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/radio/config/Pixel_Default.nprf b/radio/config/Pixel_Default.nprf index a44777e02da34de4d7858c9338d8881e299d4fe9..6019812695760a212080875b008d6e50f9e87c89 100644 GIT binary patch delta 8118 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

!-d3 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 a;J7}TKach^c2jwVkA+a6{i1yyi|~Ip+Wy`E From ee5795e8503186e4eb76a3f5483f58faebe77965 Mon Sep 17 00:00:00 2001 From: Ray Chi Date: Tue, 12 Apr 2022 16:47:17 +0800 Subject: [PATCH 2/3] usb: change function sequence if debug functions are enabled On Windows platforms, wrong function sequnce will cause usb driver installing not working. This patch will modify the function sequence when debug functions are enabled. Bug: 228800277 Test: tethering is working when debug functions are enabled. Change-Id: I9f8b02354617b08a34fb4641ac710f32dabc643e --- usb/gadget/UsbGadget.cpp | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/usb/gadget/UsbGadget.cpp b/usb/gadget/UsbGadget.cpp index 2a1e16c5..8fe69929 100644 --- a/usb/gadget/UsbGadget.cpp +++ b/usb/gadget/UsbGadget.cpp @@ -165,7 +165,6 @@ static V1_0::Status validateAndSetVidPid(uint64_t functions) { } break; case static_cast(GadgetFunction::RNDIS): - case GadgetFunction::RNDIS | GadgetFunction::NCM: if (!(vendorFunctions == "user" || vendorFunctions == "")) { ALOGE("Invalid vendorFunctions set: %s", vendorFunctions.c_str()); ret = Status::CONFIGURATION_NOT_SUPPORTED; @@ -174,7 +173,6 @@ static V1_0::Status validateAndSetVidPid(uint64_t functions) { } break; case GadgetFunction::ADB | GadgetFunction::RNDIS: - case GadgetFunction::ADB | GadgetFunction::RNDIS | GadgetFunction::NCM: if (vendorFunctions == "dm") { ret = setVidPid("0x04e8", "0x6862"); } else { @@ -309,30 +307,20 @@ V1_0::Status UsbGadget::setupFunctions(uint64_t functions, bool ffsEnabled = false; int i = 0; - // Use the NCM support hack because the gadget function has no NCM definition. - // TODO: add formal NCM function setup once gadget function supports NCM. - uint64_t usbFunctions = functions; - bool ncmEnabled = false; - const std::string vendorRndisConfig = GetProperty(google::pixel::usb::kVendorRndisConfig, ""); - if ((functions & GadgetFunction::RNDIS) && (vendorRndisConfig.find("ncm.gs", 0) == 0)) { - ncmEnabled = true; - usbFunctions &= ~static_cast(GadgetFunction::RNDIS); - } - - if (addGenericAndroidFunctions(&monitorFfs, usbFunctions, &ffsEnabled, &i) != + if (addGenericAndroidFunctions(&monitorFfs, functions, &ffsEnabled, &i) != Status::SUCCESS) return Status::ERROR; - if ((functions & GadgetFunction::NCM) != 0) { + std::string vendorFunctions = getVendorFunctions(); + + if (((functions & GadgetFunction::NCM) != 0) && (vendorFunctions != "dm")) { if (linkFunction("ncm.gs9", i++)) return Status::ERROR; } - std::string vendorFunctions = getVendorFunctions(); - if (vendorFunctions == "dm") { ALOGI("enable usbradio debug functions"); - if ((usbFunctions & GadgetFunction::RNDIS) != 0) { + if ((functions & GadgetFunction::RNDIS) != 0) { if (linkFunction("acm.gs6", i++)) return Status::ERROR; if (linkFunction("dm.gs7", i++)) @@ -353,17 +341,14 @@ V1_0::Status UsbGadget::setupFunctions(uint64_t functions, return Status::ERROR; } - if ((usbFunctions & GadgetFunction::ADB) != 0) { + if ((functions & GadgetFunction::ADB) != 0) { ffsEnabled = true; if (addAdb(&monitorFfs, &i) != Status::SUCCESS) return Status::ERROR; } - // Reordering NCM function makes Windows generic NCM driver work when vendor funcs are enabled. - // TODO: possibly remove the reordering once vendor function Windows driver supports NCM. - if (ncmEnabled) { - ALOGI("set ncm function"); - if (linkFunction(vendorRndisConfig.c_str(), i++)) + if (((functions & GadgetFunction::NCM) != 0) && (vendorFunctions == "dm")) { + if (linkFunction("ncm.gs9", i++)) return Status::ERROR; } From 101c17fc9593df2dbfa814209b402039e5549fb2 Mon Sep 17 00:00:00 2001 From: Mason Wang Date: Thu, 14 Apr 2022 12:34:22 +0800 Subject: [PATCH 3/3] dumpstate: Fix P10 touch can't work after bugreport. Do not dump the touch heatmap data to fix touch abnormally after bugreport. This is the WA. I will revert it after kernel includes the solution commit pa/2194708. Bug: 228928861 Test: touch works well after triggering bugreport. Change-Id: I43a92efa78d8b77e1616c8bf63800d5a93b99456 --- dumpstate/DumpstateDevice.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp index 1dc3636a..095559de 100644 --- a/dumpstate/DumpstateDevice.cpp +++ b/dumpstate/DumpstateDevice.cpp @@ -577,10 +577,6 @@ void DumpstateDevice::dumpTouchSection(int fd) { snprintf(cmd, sizeof(cmd), "%s/selftest/Short", focaltech_cmd_path); DumpFileToFd(fd, "Get Short Test", cmd); - // Get HeatMap(ms,ss) - snprintf(cmd, sizeof(cmd), "%s/selftest/Strength", focaltech_cmd_path); - DumpFileToFd(fd, "Get HeatMap(ms,ss)", cmd); - // Disable: force touch active snprintf(cmd, sizeof(cmd), "echo 20 > %s/force_active", focaltech_cmd_path); RunCommandToFd(fd, "Disable Force Touch Active", {"/vendor/bin/sh", "-c", cmd});