diff options
| -rw-r--r-- | cmds/atrace/atrace.rc | 21 | ||||
| -rw-r--r-- | libs/binder/Android.bp | 12 | ||||
| -rw-r--r-- | libs/binder/OWNERS | 2 | ||||
| -rw-r--r-- | libs/binder/rust/rpcbinder/Android.bp | 1 | ||||
| -rw-r--r-- | libs/binder/tests/Android.bp | 11 | ||||
| -rw-r--r-- | services/batteryservice/include/batteryservice/BatteryService.h | 1 |
6 files changed, 27 insertions, 21 deletions
diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc index 5267b0294c..ea5d602625 100644 --- a/cmds/atrace/atrace.rc +++ b/cmds/atrace/atrace.rc @@ -181,6 +181,8 @@ on late-init chmod 0666 /sys/kernel/tracing/events/clk/clk_enable/enable chmod 0666 /sys/kernel/debug/tracing/events/clk/clk_set_rate/enable chmod 0666 /sys/kernel/tracing/events/clk/clk_set_rate/enable + chmod 0666 /sys/kernel/debug/tracing/events/printk/console/enable + chmod 0666 /sys/kernel/tracing/events/printk/console/enable # disk chmod 0666 /sys/kernel/tracing/events/f2fs/f2fs_get_data_block/enable @@ -295,8 +297,18 @@ on late-init write /sys/kernel/debug/tracing/synthetic_events "rss_stat_throttled unsigned int mm_id; unsigned int curr; int member; long size" # allow creating event triggers - chmod 0666 /sys/kernel/debug/tracing/events/kmem/rss_stat/trigger chmod 0666 /sys/kernel/tracing/events/kmem/rss_stat/trigger + chmod 0666 /sys/kernel/debug/tracing/events/kmem/rss_stat/trigger + + # allow enabling rss_stat_throttled + chmod 0666 /sys/kernel/tracing/events/synthetic/rss_stat_throttled/enable + chmod 0666 /sys/kernel/debug/tracing/events/synthetic/rss_stat_throttled/enable + +on late-init && property:ro.boot.fastboot.boottrace=enabled + setprop debug.atrace.tags.enableflags 802922 + setprop persist.traced.enable 0 + write /sys/kernel/debug/tracing/tracing_on 1 + write /sys/kernel/tracing/tracing_on 1 # Only create the tracing instance if persist.mm_events.enabled # Attempting to remove the tracing instance after it has been created @@ -393,3 +405,10 @@ on property:persist.debug.atrace.boottrace=1 service boottrace /system/bin/atrace --async_start -f /data/misc/boottrace/categories disabled oneshot + +on property:sys.boot_completed=1 && property:ro.boot.fastboot.boottrace=enabled + setprop debug.atrace.tags.enableflags 0 + setprop persist.traced.enable 1 + write /sys/kernel/debug/tracing/tracing_on 0 + write /sys/kernel/tracing/tracing_on 0 + diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index da87e03162..baeb565b5e 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -74,9 +74,6 @@ cc_defaults { name: "libbinder_common_defaults", host_supported: true, - // for vndbinder and binderRpcTest - vendor_available: true, - srcs: [ "Binder.cpp", "BpBinder.cpp", @@ -200,7 +197,6 @@ cc_defaults { cc_library_headers { name: "trusty_mock_headers", - vendor_available: true, host_supported: true, export_include_dirs: [ @@ -215,7 +211,6 @@ cc_library_headers { cc_defaults { name: "trusty_mock_defaults", - vendor_available: true, host_supported: true, header_libs: [ @@ -309,6 +304,8 @@ cc_library { version_script: "libbinder.map", + // for vndbinder + vendor_available: true, vndk: { enabled: true, }, @@ -471,7 +468,6 @@ cc_library_shared { cc_library_static { name: "libbinder_tls_static", defaults: ["libbinder_tls_defaults"], - vendor_available: true, visibility: [ ":__subpackages__", ], @@ -553,8 +549,10 @@ cc_library { // Do not expand the visibility. visibility: [ ":__subpackages__", - "//packages/modules/Virtualization:__subpackages__", + "//packages/modules/Virtualization/javalib/jni", + "//packages/modules/Virtualization/vm_payload", "//device/google/cuttlefish/shared/minidroid:__subpackages__", + "//system/software_defined_vehicle:__subpackages__", ], } diff --git a/libs/binder/OWNERS b/libs/binder/OWNERS index f954e74eba..bb17683a23 100644 --- a/libs/binder/OWNERS +++ b/libs/binder/OWNERS @@ -1,6 +1,4 @@ # Bug component: 32456 -ctate@google.com -hackbod@google.com maco@google.com smoreland@google.com tkjos@google.com diff --git a/libs/binder/rust/rpcbinder/Android.bp b/libs/binder/rust/rpcbinder/Android.bp index da9797b25c..0067a20484 100644 --- a/libs/binder/rust/rpcbinder/Android.bp +++ b/libs/binder/rust/rpcbinder/Android.bp @@ -26,6 +26,7 @@ rust_library { visibility: [ "//device/google/cuttlefish/shared/minidroid/sample", "//packages/modules/Virtualization:__subpackages__", + "//system/software_defined_vehicle:__subpackages__", ], apex_available: [ "//apex_available:platform", diff --git a/libs/binder/tests/Android.bp b/libs/binder/tests/Android.bp index e609987725..0f0d64aea8 100644 --- a/libs/binder/tests/Android.bp +++ b/libs/binder/tests/Android.bp @@ -138,7 +138,6 @@ cc_test { aidl_interface { name: "binderRpcTestIface", - vendor_available: true, host_supported: true, unstable: true, srcs: [ @@ -159,7 +158,6 @@ aidl_interface { cc_library_static { name: "libbinder_tls_test_utils", - vendor_available: true, host_supported: true, target: { darwin: { @@ -213,7 +211,6 @@ cc_defaults { defaults: [ "binderRpcTest_common_defaults", ], - vendor_available: true, gtest: false, auto_gen_config: false, srcs: [ @@ -224,18 +221,10 @@ cc_defaults { cc_defaults { name: "binderRpcTest_defaults", - vendor_available: true, target: { android: { test_suites: ["vts"], }, - - vendor: { - shared_libs: [ - "libbinder_trusty", - "libtrusty", - ], - }, }, defaults: [ "binderRpcTest_common_defaults", diff --git a/services/batteryservice/include/batteryservice/BatteryService.h b/services/batteryservice/include/batteryservice/BatteryService.h index a2e4115bd6..bf6189d7af 100644 --- a/services/batteryservice/include/batteryservice/BatteryService.h +++ b/services/batteryservice/include/batteryservice/BatteryService.h @@ -37,6 +37,7 @@ enum { BATTERY_PROP_CHARGING_POLICY = 7, // equals BATTERY_PROPERTY_CHARGING_POLICY BATTERY_PROP_MANUFACTURING_DATE = 8, // equals BATTERY_PROPERTY_MANUFACTURING_DATE BATTERY_PROP_FIRST_USAGE_DATE = 9, // equals BATTERY_PROPERTY_FIRST_USAGE_DATE + BATTERY_PROP_STATE_OF_HEALTH = 10, // equals BATTERY_PROPERTY_STATE_OF_HEALTH }; struct BatteryProperties { |