drgreen/android_device_google_gs-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 11111096 from e303e26ed6c8d11daeb3369919b9f15edd8f9334 to 24Q1-release

Browse Source 
Change-Id: I67a3f3533782df2618c8c2532f9e70d723822549
This commit is contained in:
Android Build Coastguard Worker 2023-11-17 00:01:53 +00:00
commit b9ef3fddd1
9 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
battery_mitigation/battery_mitigation.cpp
View File

@ -83,10 +83,17 @@ const struct MitigationConfig::EventThreadConfig eventThreadCfg = {
{"voltage_now", "/sys/class/power_supply/battery/voltage_now"},
{"current_now", "/sys/class/power_supply/battery/current_now"},
},
.NumericSysfsStatDirs = {
{"last_triggered_mode", "/sys/devices/virtual/pmic/mitigation/last_triggered_mode/"},
},
.TriggeredIdxPath = "/sys/devices/virtual/pmic/mitigation/br_stats/triggered_idx",
.triggeredStatePath[android::hardware::google::pixel::UVLO1] =
"/sys/devices/virtual/pmic/mitigation/triggered_state/uvlo1_triggered",
.triggeredStatePath[android::hardware::google::pixel::UVLO2] =
"/sys/devices/virtual/pmic/mitigation/triggered_state/uvlo2_triggered",
.triggeredStatePath[android::hardware::google::pixel::OILO1] =
"/sys/devices/virtual/pmic/mitigation/triggered_state/oilo1_triggered",
.triggeredStatePath[android::hardware::google::pixel::OILO2] =
"/sys/devices/virtual/pmic/mitigation/triggered_state/oilo2_triggered",
.triggeredStatePath[android::hardware::google::pixel::SMPL] =
"/sys/devices/virtual/pmic/mitigation/triggered_state/smpl_triggered",
.BrownoutStatsPath = "/sys/devices/virtual/pmic/mitigation/br_stats/stats",
.StoringPath = "/data/vendor/mitigation/thismeal.bin",
.ParsedThismealPath = "/data/vendor/mitigation/thismeal.txt",
@ -112,27 +119,19 @@ const struct MitigationConfig::EventThreadConfig eventThreadCfg = {
{
.MainPmicName = "s2mpg10-odpm\n",
.SubPmicName = "s2mpg11-odpm\n",
.PcieModemPath = "/sys/devices/platform/11920000.pcie/power_stats",
.PcieWifiPath = "/sys/devices/platform/14520000.pcie/power_stats",
},
{
.MainPmicName = "s2mpg12-odpm\n",
.SubPmicName = "s2mpg13-odpm\n",
.PcieModemPath = "/sys/devices/platform/11920000.pcie/power_stats",
.PcieWifiPath = "/sys/devices/platform/14520000.pcie/power_stats",
},
{
.MainPmicName = "s2mpg14-odpm\n",
.SubPmicName = "s2mpg15-odpm\n",
.PcieModemPath = "/sys/devices/platform/12100000.pcie/power_stats",
.PcieWifiPath = "/sys/devices/platform/13120000.pcie/power_stats",
},
/* MAX_SUPPORTED_PLATFORM */
{
.MainPmicName = "s2mpg14-odpm\n",
.SubPmicName = "s2mpg15-odpm\n",
.PcieModemPath = "/sys/devices/platform/12100000.pcie/power_stats",
.PcieWifiPath = "/sys/devices/platform/13120000.pcie/power_stats",
},
},
@ -188,8 +187,6 @@ int main(int argc, char **argv) {
batteryMitigationService->genLastmealCSV(eventThreadCfg.ParsedLastmealCSVPath)) {
android::base::SetProperty(kLastMealProperty, "1");
}
/* Start BrownoutEventThread to poll brownout event from kernel */
batteryMitigationService->startBrownoutEventThread();
} else{
bmSp = new BatteryMitigation(cfg);
if (!bmSp) {
@ -226,6 +223,10 @@ int main(int argc, char **argv) {
if (isBatteryMitigationReady) {
android::base::SetProperty(kReadyProperty, "1");
}
if (isBatteryMitigationReady && brownoutStatsBinarySupported) {
/* Start BrownoutEventThread to poll brownout event from kernel */
batteryMitigationService->startBrownoutEventThread();
}
while (true) {
pause();
}

1
camera/sepolicy/product/private/service_contexts Normal file
View File

@ -0,0 +1 @@
com.google.pixel.camera.services.binder.IServiceBinder/default u:object_r:camera_binder_service:s0

3
camera/sepolicy/product/private/vendor_pbcs_app.te
View File

@ -7,3 +7,6 @@ dontaudit vendor_pbcs_app system_app_data_file:dir *;
allow vendor_pbcs_app app_api_service:service_manager find;
# Allow PBCS to find Camera Service.
allow vendor_pbcs_app cameraserver_service:service_manager find;
# Allow PBCS to add the ServiceBinder service to ServiceManager.
add_service(vendor_pbcs_app, camera_binder_service);

1
camera/sepolicy/product/public/service.te Normal file
View File

@ -0,0 +1 @@
type camera_binder_service, hal_service_type, protected_service, service_manager_type;

2
camera/sepolicy/vendor/hal_camera_default.te vendored
View File

@ -1,4 +1,4 @@
allow hal_camera_default vendor_camera_binder_service:service_manager find;
allow hal_camera_default camera_binder_service:service_manager find;
# Allow Lyric Hal to find the LyricConfigProvider service through ServiceManager.
allow hal_camera_default vendor_camera_lyricconfigprovider_service:service_manager find;

2
camera/sepolicy/vendor/service.te vendored
View File

@ -1,5 +1,3 @@
type vendor_camera_binder_service, hal_service_type, protected_service, service_manager_type;
type hal_pixel_remote_camera_service, hal_service_type, protected_service, service_manager_type;
type vendor_camera_lyricconfigprovider_service, hal_service_type, protected_service, service_manager_type;

2
camera/sepolicy/vendor/service_contexts vendored
View File

@ -1,5 +1,3 @@
com.google.pixel.camera.services.binder.IServiceBinder/default u:object_r:vendor_camera_binder_service:s0
com.google.pixel.camera.connectivity.hal.provider.ICameraProvider/default u:object_r:hal_pixel_remote_camera_service:s0
com.google.pixel.camera.services.lyricconfigprovider.ILyricConfigProvider/default u:object_r:vendor_camera_lyricconfigprovider_service:s0

2
camera/sepolicy/vendor/vendor_pbcs_app.te vendored
View File

@ -1,5 +1,5 @@
# Allow PBCS to add the ServiceBinder service to ServiceManager.
add_service(vendor_pbcs_app, vendor_camera_binder_service);
add_service(vendor_pbcs_app, camera_binder_service);
# Allow PBCS to add the LyricConfigProvider service to ServiceManager.
add_service(vendor_pbcs_app, vendor_camera_lyricconfigprovider_service);
# Allow PBCS to add the CameraIdRemapper service to ServiceManager.

2
wireless_charger/compatibility_matrix.xml
View File

@ -1,7 +1,7 @@
<compatibility-matrix version="1.0" type="framework">
<hal format="aidl" optional="true">
<name>vendor.google.wireless_charger</name>
<version>1</version>
<version>1-2</version>
<interface>
<name>IWirelessCharger</name>
<instance>default</instance>