From 3171e2372e8080a01ef59959f8b9445366fc4786 Mon Sep 17 00:00:00 2001 From: samou Date: Fri, 4 Oct 2024 08:41:51 +0000 Subject: [PATCH 1/3] sepolicy: remove irregular policy Flag: EXEMPT refactor Bug: 364989823 Signed-off-by: samou (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1822201a0c6a91d84627c6b59fcd21b223285dac) Merged-In: I4cced2ae29591425a5bfcb971be6bd2db6b19c66 Change-Id: I4cced2ae29591425a5bfcb971be6bd2db6b19c66 --- .../sepolicy/vendor/dumpstate.te | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/battery_mitigation/sepolicy/vendor/dumpstate.te b/battery_mitigation/sepolicy/vendor/dumpstate.te index bb84ff2..b3bb1d4 100644 --- a/battery_mitigation/sepolicy/vendor/dumpstate.te +++ b/battery_mitigation/sepolicy/vendor/dumpstate.te @@ -1,21 +1,3 @@ # To call battery_mitigation hal allow dumpstate hal_battery_mitigation_service:service_manager find; binder_call(dumpstate, battery_mitigation); - -allow hal_dumpstate_default sysfs_acpm_stats:dir { read open search }; -allow hal_dumpstate_default sysfs_acpm_stats:file { read open getattr }; -allow hal_dumpstate_default sysfs_cpu:file { read open getattr }; -allow hal_dumpstate_default sysfs_batteryinfo:dir { read open search }; -allow hal_dumpstate_default sysfs_batteryinfo:file { read open getattr }; -allow hal_dumpstate_default logbuffer_device:chr_file { read open getattr }; -allow hal_dumpstate_default mitigation_vendor_data_file:file { read open getattr }; -allow hal_dumpstate_default mitigation_vendor_data_file:dir { search }; -allow hal_dumpstate_default sysfs_bcl:dir { read open search }; -allow hal_dumpstate_default sysfs_bcl:file { read open getattr }; -allow hal_dumpstate_default vendor_file:file { execute_no_trans }; -allow hal_dumpstate_default battery_history_device:chr_file { read }; - - -userdebug_or_eng(` - allow hal_dumpstate_default vendor_pm_genpd_debugfs:file { read open getattr }; -') From 1d50676e3feb0df643e93bce5f5634a53af10641 Mon Sep 17 00:00:00 2001 From: Tommy Chiu Date: Wed, 9 Oct 2024 05:05:34 +0000 Subject: [PATCH 2/3] gsc: Change the criteria for building GSC targets There can be a case where vendor directory exists but vendor/google_nos does not. Bug: 371059500 Test: manual Flag: EXEMPT refactor (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8af77ef94228bf37bd7be4d8db496f7084e0333d) Merged-In: I96f429ec3284114868ad220ea308a6920930c065 Change-Id: I96f429ec3284114868ad220ea308a6920930c065 --- dauntless/gsc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dauntless/gsc.mk b/dauntless/gsc.mk index c1cf0e0..b563cc4 100644 --- a/dauntless/gsc.mk +++ b/dauntless/gsc.mk @@ -1,6 +1,6 @@ # Dauntless BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/dauntless/sepolicy -ifneq ($(wildcard vendor),) +ifneq ($(wildcard vendor/google_nos),) PRODUCT_SOONG_NAMESPACES += vendor/google_nos/init/dauntless PRODUCT_PACKAGES += \ @@ -92,4 +92,4 @@ endif $(call dist-for-goals,droid,vendor/google_nos/prebuilts/dauntless/intermediate_images/d3m2_intermediate.ec.bin) endif -endif # $(wildcard vendor) +endif # $(wildcard vendor/google_nos) From 5085275f712b1555e22902886e246b602e06a678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Mon, 2 Dec 2024 20:31:08 +0000 Subject: [PATCH 3/3] Add libg3a logging initrc files. These files are installed on the vendor partition regardless of whether we use a prebuilt APEX or build it from source. History links (Google internal only): libg3a_gabc.rc: https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:vendor/google/camera/google_3a/libs_v4/gABC/libg3a_gabc.rc;drc=82654c90cc30d21948d0be24931edda10739caf0 libg3a_gaf.rc: https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:vendor/google/camera/google_3a/libs_v4/gAF/libg3a_gaf.rc;drc=1e01ef4606e8553866d803a30e4284485ff12741 libg3a_ghawb.rc: https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:vendor/google/camera/google_3a/libs_v4/gHAWB/libg3a_ghawb.rc;drc=82654c90cc30d21948d0be24931edda10739caf0 Bug: 380379803 Test: presubmit, check husky logs when prebuilt APEX is used Flag: EXEMPT build system fix Change-Id: I405c0e3ad78d63e3faee8723c2ba7ba7cf0dd6db --- camera/Android.bp | 24 ++++++++++++ camera/libg3a_gabc.rc | 28 ++++++++++++++ camera/libg3a_gaf.rc | 83 ++++++++++++++++++++++++++++++++++++++++++ camera/libg3a_ghawb.rc | 28 ++++++++++++++ 4 files changed, 163 insertions(+) create mode 100644 camera/libg3a_gabc.rc create mode 100644 camera/libg3a_gaf.rc create mode 100644 camera/libg3a_ghawb.rc diff --git a/camera/Android.bp b/camera/Android.bp index e845678..2c7ec58 100644 --- a/camera/Android.bp +++ b/camera/Android.bp @@ -34,3 +34,27 @@ prebuilt_etc { src: "com.google.pixel.camera.concurrent_foldable_dual_front.xml", sub_dir: "permissions", } + +prebuilt_etc { + name: "libg3a_standalone_gabc_rc", + vendor: true, + proprietary: true, + init_rc: ["libg3a_gabc.rc"], + src: "libg3a_gabc.rc", +} + +prebuilt_etc { + name: "libg3a_standalone_gaf_rc", + vendor: true, + proprietary: true, + init_rc: ["libg3a_gaf.rc"], + src: "libg3a_gaf.rc", +} + +prebuilt_etc { + name: "libg3a_standalone_ghawb_rc", + vendor: true, + proprietary: true, + init_rc: ["libg3a_ghawb.rc"], + src: "libg3a_ghawb.rc", +} diff --git a/camera/libg3a_gabc.rc b/camera/libg3a_gabc.rc new file mode 100644 index 0000000..c092edd --- /dev/null +++ b/camera/libg3a_gabc.rc @@ -0,0 +1,28 @@ +# override default log levels. +on boot + setprop log.tag.GABC E + +# backward-compatible system props. +on property:persist.vendor.camera.gabc.debug_level=0 + setprop log.tag.GABC S + +on property:persist.vendor.camera.gabc.debug_level=1 + setprop log.tag.GABC V + +on property:persist.vendor.camera.gabc.debug_level=2 + setprop log.tag.GABC V + +on property:persist.vendor.camera.gabc.debug_level=3 + setprop log.tag.GABC D + +on property:persist.vendor.camera.gabc.debug_level=4 + setprop log.tag.GABC I + +on property:persist.vendor.camera.gabc.debug_level=5 + setprop log.tag.GABC W + +on property:persist.vendor.camera.gabc.debug_level=6 + setprop log.tag.GABC E + +on property:persist.vendor.camera.gabc.debug_level=7 + setprop log.tag.GABC A diff --git a/camera/libg3a_gaf.rc b/camera/libg3a_gaf.rc new file mode 100644 index 0000000..214b467 --- /dev/null +++ b/camera/libg3a_gaf.rc @@ -0,0 +1,83 @@ +# override default log levels. +on boot + setprop log.tag.GAF E + +# backward-compatible system props. +on property:persist.vendor.camera.af.debug_level=0 + setprop log.tag.GAF S + +on property:persist.vendor.camera.af.debug_level=1 + setprop log.tag.GAF V + +on property:persist.vendor.camera.af.debug_level=2 + setprop log.tag.GAF V + +on property:persist.vendor.camera.af.debug_level=3 + setprop log.tag.GAF D + +on property:persist.vendor.camera.af.debug_level=4 + setprop log.tag.GAF I + +on property:persist.vendor.camera.af.debug_level=5 + setprop log.tag.GAF W + +on property:persist.vendor.camera.af.debug_level=6 + setprop log.tag.GAF E + +on property:persist.vendor.camera.af.debug_level=7 + setprop log.tag.GAF A + +on property:persist.vendor.camera.af.video_debug_enable=2 + setprop vendor.camera.3a.log_level 1 + setprop log.tag.3a.gcrd.af.parser.input V + setprop log.tag.3a.gcrd.af.parser.output V + setprop log.tag.3a.gcrd.af.processor V + setprop log.tag.3a.gcrd.af.engine V + setprop log.tag.3a.gcrd.dtm V + +on property:persist.vendor.camera.af.video_debug_enable=0 + setprop vendor.camera.3a.log_level 6 + setprop log.tag.3a.gcrd.af.parser.input E + setprop log.tag.3a.gcrd.af.parser.output E + setprop log.tag.3a.gcrd.af.processor E + setprop log.tag.3a.gcrd.af.engine E + setprop log.tag.3a.gcrd.dtm E + +on property:persist.vendor.camera.af.default_focus_only=false + setprop persist.vendor.camera.af.ignore_ctrl_focus_region false + setprop persist.vendor.camera.af.ignore_face 0 + setprop persist.vendor.camera.af.force_saliency_consumption "" + +on property:persist.vendor.camera.af.default_focus_only=true + setprop persist.vendor.camera.af.ignore_ctrl_focus_region true + setprop persist.vendor.camera.af.ignore_face 1 + setprop persist.vendor.camera.af.force_saliency_consumption false + +# Reset every related properties +on property:persist.vendor.camera.af.standalone_searchlet=reset + setprop persist.vendor.camera.af.ignore_pd \"\" + setprop persist.vendor.camera.af.ignore_tof \"\" + setprop persist.vendor.camera.af.ignore_cdaf \"\" + setprop persist.vendor.camera.af.ignore_gyro \"\" + setprop persist.vendor.camera.af.ignore_3a \"\" + setprop vendor.camera.debug.enable_saliency \"\" + +# Standalone framework: PDAF +on property:persist.vendor.camera.af.standalone_searchlet=pdaf + setprop persist.vendor.camera.af.ignore_tof 1 + setprop persist.vendor.camera.af.ignore_gyro 1 + setprop persist.vendor.camera.af.ignore_3a 1 + setprop vendor.camera.debug.enable_saliency 0 + +# Standalone framework: LDAF +on property:persist.vendor.camera.af.standalone_searchlet=ldaf + setprop persist.vendor.camera.af.ignore_pd 7 + setprop persist.vendor.camera.af.ignore_gyro 1 + setprop persist.vendor.camera.af.ignore_3a 1 + setprop vendor.camera.debug.enable_saliency 0 + +# Standalone framework: CDAF +on property:persist.vendor.camera.af.standalone_searchlet=cdaf + setprop persist.vendor.camera.af.ignore_pd 7 + setprop persist.vendor.camera.af.ignore_tof 1 + setprop vendor.camera.debug.enable_saliency 0 diff --git a/camera/libg3a_ghawb.rc b/camera/libg3a_ghawb.rc new file mode 100644 index 0000000..4ca6717 --- /dev/null +++ b/camera/libg3a_ghawb.rc @@ -0,0 +1,28 @@ +# override default log levels. +on boot + setprop log.tag.GHAWB E + +# backward-compatible system props. +on property:persist.vendor.camera.ghawb.debug_level=0 + setprop log.tag.GHAWB S + +on property:persist.vendor.camera.ghawb.debug_level=1 + setprop log.tag.GHAWB V + +on property:persist.vendor.camera.ghawb.debug_level=2 + setprop log.tag.GHAWB V + +on property:persist.vendor.camera.ghawb.debug_level=3 + setprop log.tag.GHAWB D + +on property:persist.vendor.camera.ghawb.debug_level=4 + setprop log.tag.GHAWB I + +on property:persist.vendor.camera.ghawb.debug_level=5 + setprop log.tag.GHAWB W + +on property:persist.vendor.camera.ghawb.debug_level=6 + setprop log.tag.GHAWB E + +on property:persist.vendor.camera.ghawb.debug_level=7 + setprop log.tag.GHAWB A