From a73876fe6277b076a54b91195e825d312c66e6f5 Mon Sep 17 00:00:00 2001 From: Mark Chang Date: Tue, 11 Oct 2022 06:13:20 +0000 Subject: [PATCH 1/4] Start twoshay service on boot. Bug: 226474828 Test: Verified twoshay launched successfully. Signed-off-by: Mark Chang Change-Id: I3294cfaced458527f6967720f109502d7d9f5ed2 --- conf/init.felix.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/init.felix.rc b/conf/init.felix.rc index 3a4814c..637bf05 100644 --- a/conf/init.felix.rc +++ b/conf/init.felix.rc @@ -51,7 +51,7 @@ on property:vendor.device.modules.ready=1 chmod 660 /dev/touch_offload_fts chmod 660 /dev/touch_offload_fts_ext # Start the twoshay touch service - # start twoshay + start twoshay # Toggle glove_mode according to touch_sensitivity_mode on property:persist.vendor.touch_sensitivity_mode=0 && property:sys.boot_completed=1 From 2d1941f5e0890805b982f49fb1bc88ce22b71352 Mon Sep 17 00:00:00 2001 From: Darren Hsu Date: Mon, 17 Oct 2022 12:07:26 +0800 Subject: [PATCH 2/4] powerstats: update specific data provider configurations Bug: 253951732 Test: dumpsys android.hardware.power.stats.IPowerStats/default Change-Id: Idf73f9e65ddd0f47146b1bfac5ac6b101103c5ca Signed-off-by: Darren Hsu --- powerstats/felix/Android.bp | 2 ++ powerstats/felix/service.cpp | 53 ++++++++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/powerstats/felix/Android.bp b/powerstats/felix/Android.bp index b7c146f..6a46051 100644 --- a/powerstats/felix/Android.bp +++ b/powerstats/felix/Android.bp @@ -16,6 +16,7 @@ soong_namespace { imports: [ "hardware/google/pixel", "device/google/gs201/powerstats", + "device/google/gs-common/powerstats", ] } @@ -40,5 +41,6 @@ cc_binary { shared_libs: [ "android.hardware.power.stats-impl.gs201", + "android.hardware.power.stats-impl.gs-common", ], } diff --git a/powerstats/felix/service.cpp b/powerstats/felix/service.cpp index d20effd..92dd056 100644 --- a/powerstats/felix/service.cpp +++ b/powerstats/felix/service.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -28,6 +29,7 @@ #include #include +using aidl::android::hardware::power::stats::DevfreqStateResidencyDataProvider; using aidl::android::hardware::power::stats::DisplayStateResidencyDataProvider; using aidl::android::hardware::power::stats::EnergyConsumerType; using aidl::android::hardware::power::stats::GenericStateResidencyDataProvider; @@ -105,6 +107,39 @@ void addUwb(std::shared_ptr p) { "/sys/devices/platform/10db0000.spi/spi_master/spi16/spi16.0/uwb/power_stats", cfgs)); } +void addGPUGs202(std::shared_ptr p) { + std::map stateCoeffs; + + // Add GPU state residency + p->addStateResidencyDataProvider(std::make_unique( + "GPU", + "/sys/devices/platform/28000000.mali")); + + // Add GPU energy consumer + stateCoeffs = { + {"202000", 890}, + {"251000", 1102}, + {"302000", 1308}, + {"351000", 1522}, + {"400000", 1772}, + {"434000", 1931}, + {"471000", 2105}, + {"510000", 2292}, + {"572000", 2528}, + {"633000", 2811}, + {"701000", 3127}, + {"762000", 3452}, + {"848000", 4044}}; + + p->addEnergyConsumer(PowerStatsEnergyConsumer::createMeterAndAttrConsumer( + p, + EnergyConsumerType::OTHER, + "GPU", + {"S2S_VDD_G3D", "S8S_VDD_G3D_L2"}, + {{UID_TIME_IN_STATE, "/sys/devices/platform/28000000.mali/uid_time_in_state"}}, + stateCoeffs)); +} + int main() { LOG(INFO) << "Pixel PowerStats HAL AIDL Service is starting."; @@ -113,10 +148,24 @@ int main() { std::shared_ptr p = ndk::SharedRefBase::make(); - addGs201CommonDataProviders(p); + setEnergyMeter(p); + addAoC(p); + addPixelStateResidencyDataProvider(p); + addCPUclusters(p); addDisplay(p); - addUwb(p); + addSoC(p); + addGNSS(p); + addMobileRadio(p); + addPCIe(p); + addWifi(p); + addTPU(p); + addUfs(p); addNFC(p, "/sys/devices/platform/10970000.hsi2c/i2c-4/i2c-st21nfc/power_stats"); + addUwb(p); + addPowerDomains(p); + addDevfreq(p); + addGPUGs202(p); + addDvfsStats(p); const std::string instance = std::string() + PowerStats::descriptor + "/default"; binder_status_t status = AServiceManager_addService(p->asBinder().get(), instance.c_str()); From df9fac5406b83f607fb37cf6d696da5eb7c2c8cd Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Mon, 17 Oct 2022 18:02:24 +0800 Subject: [PATCH 3/4] BT SAR table for EVT dogfood EU and US region of Bluetooth sar table for EVT dogfood. Currently no table for JP, so use EU table for the first release. Bug: 254002880 Test: Maual Change-Id: Icc2ed14dcc85ca19fceea62481c7834421f7c263 --- bluetooth/bluetooth_power_limits_felix_EU.csv | 67 +++++++++++++++++++ bluetooth/bluetooth_power_limits_felix_JP.csv | 67 +++++++++++++++++++ bluetooth/bluetooth_power_limits_felix_US.csv | 67 +++++++++++++++++++ device-felix.mk | 7 ++ 4 files changed, 208 insertions(+) create mode 100644 bluetooth/bluetooth_power_limits_felix_EU.csv create mode 100644 bluetooth/bluetooth_power_limits_felix_JP.csv create mode 100644 bluetooth/bluetooth_power_limits_felix_US.csv diff --git a/bluetooth/bluetooth_power_limits_felix_EU.csv b/bluetooth/bluetooth_power_limits_felix_EU.csv new file mode 100644 index 0000000..88c1d86 --- /dev/null +++ b/bluetooth/bluetooth_power_limits_felix_EU.csv @@ -0,0 +1,67 @@ +Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1 +off,off,off,off,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,off,off,off,on,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,off,off,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,off,off,on,on,on,60,60,36,78,76,36,60,60,24,60,60,24 +off,off,off,on,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,off,on,off,on,on,60,60,36,78,76,36,60,60,24,60,60,24 +off,off,off,on,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,off,on,on,on,on,60,60,36,78,76,36,60,60,24,60,60,24 +off,off,on,off,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,on,off,off,on,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,on,off,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,on,off,on,on,on,60,60,36,78,76,36,60,60,24,60,60,24 +off,off,on,on,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,on,on,off,on,on,60,60,36,78,76,36,60,60,24,60,60,24 +off,off,on,on,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,on,on,on,on,on,60,60,36,78,76,36,60,60,24,60,60,24 +off,on,off,off,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,off,off,off,on,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,off,off,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,off,off,on,on,any,60,60,36,78,76,36,60,60,24,60,60,24 +off,on,off,on,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,off,on,off,on,any,60,60,36,78,76,36,60,60,24,60,60,24 +off,on,off,on,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,off,on,on,on,any,60,60,36,78,76,36,60,60,24,60,60,24 +off,on,on,off,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,on,off,off,on,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,on,off,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,on,off,on,on,any,60,60,36,78,76,36,60,60,24,60,60,24 +off,on,on,on,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,on,on,off,on,any,60,60,36,78,76,36,60,60,24,60,60,24 +off,on,on,on,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,on,on,on,on,any,60,60,36,78,76,36,60,60,24,60,60,24 +off,off,any,any,any,any,off,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,off,off,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,off,off,off,on,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,off,off,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,off,off,on,on,on,62,62,36,72,72,36,60,60,24,60,60,24 +on,off,off,on,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,off,on,off,on,on,62,62,36,72,72,36,60,60,24,60,60,24 +on,off,off,on,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,off,on,on,on,on,62,62,36,72,72,36,60,60,24,60,60,24 +on,off,on,off,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,on,off,off,on,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,on,off,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,on,off,on,on,on,62,62,36,72,72,36,60,60,24,60,60,24 +on,off,on,on,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,on,on,off,on,on,62,62,36,72,72,36,60,60,24,60,60,24 +on,off,on,on,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,on,on,on,on,on,62,62,36,72,72,36,60,60,24,60,60,24 +on,on,off,off,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,off,off,off,on,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,off,off,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,off,off,on,on,any,62,62,36,72,72,36,60,60,24,60,60,24 +on,on,off,on,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,off,on,off,on,any,62,62,36,72,72,36,60,60,24,60,60,24 +on,on,off,on,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,off,on,on,on,any,62,62,36,72,72,36,60,60,24,60,60,24 +on,on,on,off,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,on,off,off,on,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,on,off,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,on,off,on,on,any,62,62,36,72,72,36,60,60,24,60,60,24 +on,on,on,on,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,on,on,off,on,any,62,62,36,72,72,36,60,60,24,60,60,24 +on,on,on,on,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,on,on,on,on,any,62,62,36,72,72,36,60,60,24,60,60,24 +on,off,any,any,any,any,off,78,76,36,78,76,36,62,62,24,62,62,24 \ No newline at end of file diff --git a/bluetooth/bluetooth_power_limits_felix_JP.csv b/bluetooth/bluetooth_power_limits_felix_JP.csv new file mode 100644 index 0000000..88c1d86 --- /dev/null +++ b/bluetooth/bluetooth_power_limits_felix_JP.csv @@ -0,0 +1,67 @@ +Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1 +off,off,off,off,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,off,off,off,on,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,off,off,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,off,off,on,on,on,60,60,36,78,76,36,60,60,24,60,60,24 +off,off,off,on,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,off,on,off,on,on,60,60,36,78,76,36,60,60,24,60,60,24 +off,off,off,on,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,off,on,on,on,on,60,60,36,78,76,36,60,60,24,60,60,24 +off,off,on,off,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,on,off,off,on,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,on,off,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,on,off,on,on,on,60,60,36,78,76,36,60,60,24,60,60,24 +off,off,on,on,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,on,on,off,on,on,60,60,36,78,76,36,60,60,24,60,60,24 +off,off,on,on,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +off,off,on,on,on,on,on,60,60,36,78,76,36,60,60,24,60,60,24 +off,on,off,off,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,off,off,off,on,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,off,off,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,off,off,on,on,any,60,60,36,78,76,36,60,60,24,60,60,24 +off,on,off,on,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,off,on,off,on,any,60,60,36,78,76,36,60,60,24,60,60,24 +off,on,off,on,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,off,on,on,on,any,60,60,36,78,76,36,60,60,24,60,60,24 +off,on,on,off,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,on,off,off,on,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,on,off,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,on,off,on,on,any,60,60,36,78,76,36,60,60,24,60,60,24 +off,on,on,on,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,on,on,off,on,any,60,60,36,78,76,36,60,60,24,60,60,24 +off,on,on,on,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +off,on,on,on,on,on,any,60,60,36,78,76,36,60,60,24,60,60,24 +off,off,any,any,any,any,off,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,off,off,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,off,off,off,on,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,off,off,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,off,off,on,on,on,62,62,36,72,72,36,60,60,24,60,60,24 +on,off,off,on,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,off,on,off,on,on,62,62,36,72,72,36,60,60,24,60,60,24 +on,off,off,on,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,off,on,on,on,on,62,62,36,72,72,36,60,60,24,60,60,24 +on,off,on,off,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,on,off,off,on,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,on,off,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,on,off,on,on,on,62,62,36,72,72,36,60,60,24,60,60,24 +on,off,on,on,off,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,on,on,off,on,on,62,62,36,72,72,36,60,60,24,60,60,24 +on,off,on,on,on,off,on,78,76,36,78,76,36,62,62,24,62,62,24 +on,off,on,on,on,on,on,62,62,36,72,72,36,60,60,24,60,60,24 +on,on,off,off,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,off,off,off,on,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,off,off,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,off,off,on,on,any,62,62,36,72,72,36,60,60,24,60,60,24 +on,on,off,on,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,off,on,off,on,any,62,62,36,72,72,36,60,60,24,60,60,24 +on,on,off,on,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,off,on,on,on,any,62,62,36,72,72,36,60,60,24,60,60,24 +on,on,on,off,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,on,off,off,on,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,on,off,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,on,off,on,on,any,62,62,36,72,72,36,60,60,24,60,60,24 +on,on,on,on,off,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,on,on,off,on,any,62,62,36,72,72,36,60,60,24,60,60,24 +on,on,on,on,on,off,any,78,76,36,78,76,36,62,62,24,62,62,24 +on,on,on,on,on,on,any,62,62,36,72,72,36,60,60,24,60,60,24 +on,off,any,any,any,any,off,78,76,36,78,76,36,62,62,24,62,62,24 \ No newline at end of file diff --git a/bluetooth/bluetooth_power_limits_felix_US.csv b/bluetooth/bluetooth_power_limits_felix_US.csv new file mode 100644 index 0000000..02c8f2c --- /dev/null +++ b/bluetooth/bluetooth_power_limits_felix_US.csv @@ -0,0 +1,67 @@ +Hall,Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1 +off,off,off,off,off,off,on,78,76,78,78,76,78,62,62,62,62,62,62 +off,off,off,off,off,on,on,72,72,72,78,76,78,62,62,62,62,62,62 +off,off,off,off,on,off,on,72,72,72,78,76,78,62,62,62,62,62,62 +off,off,off,off,on,on,on,60,60,60,78,76,78,60,60,60,60,60,60 +off,off,off,on,off,off,on,72,72,72,78,76,78,62,62,62,62,62,62 +off,off,off,on,off,on,on,60,60,60,78,76,78,60,60,60,60,60,60 +off,off,off,on,on,off,on,72,72,72,78,76,78,62,62,62,62,62,62 +off,off,off,on,on,on,on,60,60,60,78,76,78,60,60,60,60,60,60 +off,off,on,off,off,off,on,72,72,72,78,76,78,62,62,62,62,62,62 +off,off,on,off,off,on,on,72,72,72,78,76,78,62,62,62,62,62,62 +off,off,on,off,on,off,on,72,72,72,78,76,78,62,62,62,62,62,62 +off,off,on,off,on,on,on,60,60,60,78,76,78,60,60,60,60,60,60 +off,off,on,on,off,off,on,72,72,72,78,76,78,62,62,62,62,62,62 +off,off,on,on,off,on,on,60,60,60,78,76,78,60,60,60,60,60,60 +off,off,on,on,on,off,on,72,72,72,78,76,78,62,62,62,62,62,62 +off,off,on,on,on,on,on,60,60,60,78,76,78,60,60,60,60,60,60 +off,on,off,off,off,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,off,off,off,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,off,off,on,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,off,off,on,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,off,on,off,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,off,on,off,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,off,on,on,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,off,on,on,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,on,off,off,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,on,off,off,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,on,off,on,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,on,off,on,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,on,on,off,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,on,on,off,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,on,on,on,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,on,on,on,on,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +off,off,any,any,any,any,off,78,76,78,78,76,78,62,62,62,62,62,62 +on,off,off,off,off,off,on,78,76,78,78,76,78,62,62,62,62,62,62 +on,off,off,off,off,on,on,78,76,78,78,76,78,62,62,62,62,62,62 +on,off,off,off,on,off,on,78,76,78,78,76,78,62,62,62,62,62,62 +on,off,off,off,on,on,on,72,72,72,78,76,78,62,62,62,62,62,62 +on,off,off,on,off,off,on,78,76,78,78,76,78,62,62,62,62,62,62 +on,off,off,on,off,on,on,72,72,72,78,76,78,62,62,62,62,62,62 +on,off,off,on,on,off,on,78,76,78,78,76,78,62,62,62,62,62,62 +on,off,off,on,on,on,on,72,72,72,78,76,78,62,62,62,62,62,62 +on,off,on,off,off,off,on,78,76,78,78,76,78,62,62,62,62,62,62 +on,off,on,off,off,on,on,78,76,78,78,76,78,62,62,62,62,62,62 +on,off,on,off,on,off,on,78,76,78,78,76,78,62,62,62,62,62,62 +on,off,on,off,on,on,on,72,72,72,78,76,78,62,62,62,62,62,62 +on,off,on,on,off,off,on,78,76,78,78,76,78,62,62,62,62,62,62 +on,off,on,on,off,on,on,72,72,72,78,76,78,62,62,62,62,62,62 +on,off,on,on,on,off,on,78,76,78,78,76,78,62,62,62,62,62,62 +on,off,on,on,on,on,on,72,72,72,78,76,78,62,62,62,62,62,62 +on,on,off,off,off,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,off,off,off,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,off,off,on,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,off,off,on,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,off,on,off,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,off,on,off,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,off,on,on,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,off,on,on,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,on,off,off,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,on,off,off,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,on,off,on,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,on,off,on,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,on,on,off,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,on,on,off,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,on,on,on,off,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,on,on,on,on,on,any,36,36,36,62,62,62,36,36,36,36,36,36 +on,off,any,any,any,any,off,78,76,78,78,76,78,62,62,62,62,62,62 \ No newline at end of file diff --git a/device-felix.mk b/device-felix.mk index f832d3f..048eea6 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -134,6 +134,13 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +# Bluetooth Tx power caps +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_felix_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ + $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_felix_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_JP.csv \ + $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_felix_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv \ + $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_felix_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv + # Spatial Audio PRODUCT_PACKAGES += \ libspatialaudio From 164d501811b3d8a849a32c2675a9acfe92caa973 Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Tue, 18 Oct 2022 16:12:43 +0800 Subject: [PATCH 4/4] Add hci_inject in userdebug build Bug: 254203740 Test: make Change-Id: I2bb5109f0fbf48bfd6b07afcc6a7a4f8bb503fb7 --- device-felix.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/device-felix.mk b/device-felix.mk index a92da68..668b748 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -139,6 +139,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PACKAGES_DEBUG += \ sar_test +# Bluetooth hci_inject test tool +PRODUCT_PACKAGES_DEBUG += \ + hci_inject + # Bluetooth PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.a2dp_aac.vbr_supported=true