From da1f2ab114c8bc471afeb986638c19b8e50ef3ef Mon Sep 17 00:00:00 2001 From: Martin Liu Date: Wed, 1 Apr 2020 15:57:17 +0800 Subject: [PATCH] mm_event: move mm_event into common This CL moves mm_event and relative sepolicy into common Bug: 152414692 Test: build Signed-off-by: Martin Liu Change-Id: Ie6d9c40f5fd2ac3f9abb86edc4d43baa88864f55 --- device.mk | 1 + init.hardware.rc | 25 ------------------------- sepolicy/vendor/vendor_init.te | 3 --- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/device.mk b/device.mk index 8a53b0f1..b2094b61 100755 --- a/device.mk +++ b/device.mk @@ -758,3 +758,4 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.charger.enable_suspend=true include hardware/google/pixel/vibrator/drv2624/device.mk +include hardware/google/pixel/mm/device_legacy.mk diff --git a/init.hardware.rc b/init.hardware.rc index 37e333e6..6065249b 100644 --- a/init.hardware.rc +++ b/init.hardware.rc @@ -754,31 +754,6 @@ on property:sys.retaildemo.enabled=1 setprop persist.vendor.charge.start.level 30 on property:sys.boot_completed=1 - # Create pixel-trace. - # At this moment, only mm_event is available. If others want to put more, - # it should get hard review from pixel-perf-team. - - mkdir /sys/kernel/debug/tracing/instances/pixel-trace 755 system system - chown system system /sys/kernel/debug/tracing/instances/pixel-trace/trace - chmod 0660 /sys/kernel/debug/tracing/instances/pixel-trace/trace - chown system system /sys/kernel/debug/tracing/instances/pixel-trace/tracing_on - chmod 0660 /sys/kernel/debug/tracing/instances/pixel-trace/tracing_on - write /sys/kernel/debug/tracing/instances/pixel-trace/buffer_size_kb 64 - write /sys/kernel/debug/tracing/instances/pixel-trace/events/mm_event/enable 1 - -# turns off tracing right before bugreporting to keep more traces -on property:init.svc.dumpstatez=running - write /d/tracing/instances/pixel-trace/tracing_on 0 - -on property:init.svc.dumpstatez=stopped - write /d/tracing/instances/pixel-trace/tracing_on 1 - -on property:init.svc.bugreport=running - write /d/tracing/instances/pixel-trace/tracing_on 0 - -on property:init.svc.bugreport=stopped - write /d/tracing/instances/pixel-trace/tracing_on 1 - # init-fingerprint-sh is for stopping fps_hal after init retry fail serval times # It keeps running until max init retry or fps_hal running successfully # vendor.fps_hal restarts until max init retry times diff --git a/sepolicy/vendor/vendor_init.te b/sepolicy/vendor/vendor_init.te index fd786118..cc57e34b 100644 --- a/sepolicy/vendor/vendor_init.te +++ b/sepolicy/vendor/vendor_init.te @@ -31,9 +31,6 @@ set_prop(vendor_init, vendor_charge_prop) dontaudit vendor_init unlabeled:dir getattr; dontaudit vendor_init unlabeled:file getattr; -allow vendor_init debugfs_tracing_instances:dir create_dir_perms; -allow vendor_init debugfs_tracing_instances:file w_file_perms; - # Write to touch vrmode node allow vendor_init sysfs_touch:file w_file_perms;