Snap for 7310088 from ef1f8bb27564883e2dc7db4b50ab6007959d8b75 to sc-d1-release (8e20cb86) · Commits · e / os / android_hardware_interfaces

atrace/1.0/default/AtraceDevice.cpp

+26 −11

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		#include <android-base/file.h>
		#include <android-base/logging.h>
		#include <android-base/stringprintf.h>

		#include "AtraceDevice.h"

		@@ -39,15 +40,11 @@ const std::map<std::string, TracingConfig> kTracingMap = {
		// gfx
		{
		"gfx",
		{"Graphics",
		{{"/sys/kernel/debug/tracing/events/mdss/enable", false},
		{"/sys/kernel/debug/tracing/events/sde/enable", false},
		{"/sys/kernel/debug/tracing/events/mali_systrace/enable", false}}},
		{"Graphics", {{"mdss", false}, {"sde", false}, {"mali_systrace", false}}},
		},
		{
		"ion",
		{"ION allocation",
		{{"/sys/kernel/debug/tracing/events/kmem/ion_alloc_buffer_start/enable", false}}},
		{"ION allocation", {{"kmem/ion_alloc_buffer_start", false}}},
		},
		};

		@@ -65,16 +62,31 @@ Return<void> AtraceDevice::listCategories(listCategories_cb _hidl_cb) {
		return Void();
		}

		AtraceDevice::AtraceDevice() {
		struct stat st;

		tracefs_event_root_ = "/sys/kernel/tracing/events/";
		if (stat(tracefs_event_root_.c_str(), &st) != 0) {
		tracefs_event_root_ = "/sys/kernel/debug/tracing/events/";
		CHECK(stat(tracefs_event_root_.c_str(), &st) == 0) << "tracefs must be mounted at either"
		"/sys/kernel/tracing or "
		"/sys/kernel/debug/tracing";
		}
		}

		Return<::android::hardware::atrace::V1_0::Status> AtraceDevice::enableCategories(
		const hidl_vec<hidl_string>& categories) {
		if (!categories.size()) {
		return Status::ERROR_INVALID_ARGUMENT;
		}

		for (auto& c : categories) {
		if (kTracingMap.count(c)) {
		for (auto& p : kTracingMap.at(c).paths) {
		if (!android::base::WriteStringToFile("1", p.first)) {
		LOG(ERROR) << "Failed to enable tracing on: " << p.first;
		std::string tracefs_event_enable_path = android::base::StringPrintf(
		"%s%s/enable", tracefs_event_root_.c_str(), p.first.c_str());
		if (!android::base::WriteStringToFile("1", tracefs_event_enable_path)) {
		LOG(ERROR) << "Failed to enable tracing on: " << tracefs_event_enable_path;
		if (p.second) {
		// disable before return
		disableAllCategories();
		@@ -91,10 +103,13 @@ Return<::android::hardware::atrace::V1_0::Status> AtraceDevice::enableCategories

		Return<::android::hardware::atrace::V1_0::Status> AtraceDevice::disableAllCategories() {
		auto ret = Status::SUCCESS;

		for (auto& c : kTracingMap) {
		for (auto& p : c.second.paths) {
		if (!android::base::WriteStringToFile("0", p.first)) {
		LOG(ERROR) << "Failed to disable tracing on: " << p.first;
		std::string tracefs_event_enable_path = android::base::StringPrintf(
		"%s%s/enable", tracefs_event_root_.c_str(), p.first.c_str());
		if (!android::base::WriteStringToFile("0", tracefs_event_enable_path)) {
		LOG(ERROR) << "Failed to disable tracing on: " << tracefs_event_enable_path;
		if (p.second) {
		ret = Status::ERROR_TRACING_POINT;
		}

atrace/1.0/default/AtraceDevice.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -36,12 +36,16 @@ using ::android::hardware::Return;
		using ::android::hardware::Void;

		struct AtraceDevice : public IAtraceDevice {
		AtraceDevice();
		// Methods from ::android::hardware::atrace::V1_0::IAtraceDevice follow.
		Return<void> listCategories(listCategories_cb _hidl_cb) override;
		Return<::android::hardware::atrace::V1_0::Status> enableCategories(
		const hidl_vec<hidl_string>& categories) override;
		Return<::android::hardware::atrace::V1_0::Status> disableAllCategories() override;

		private:
		std::string tracefs_event_root_;

		// Methods from ::android::hidl::base::V1_0::IBase follow.
		};

atrace/1.0/default/android.hardware.atrace@1.0-service.rc

+4 −0

Original line number	Diff line number	Diff line
		on late-init
		# vendor graphics trace points
		chmod 0666 /sys/kernel/debug/tracing/events/sde/enable
		chmod 0666 /sys/kernel/tracing/events/sde/enable
		chmod 0666 /sys/kernel/debug/tracing/events/mdss/enable
		chmod 0666 /sys/kernel/tracing/events/mdss/enable
		chmod 0666 /sys/kernel/debug/tracing/events/mali_systrace/enable
		chmod 0666 /sys/kernel/tracing/events/mali_systrace/enable
		# ion allocation trace point
		chmod 0666 /sys/kernel/debug/tracing/events/kmem/ion_alloc_buffer_start/enable
		chmod 0666 /sys/kernel/tracing/events/kmem/ion_alloc_buffer_start/enable

		service vendor.atrace-hal-1-0 /vendor/bin/hw/android.hardware.atrace@1.0-service
		interface android.hardware.atrace@1.0::IAtraceDevice default

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/AcquiredInfo.aidl

+27 −26

Original line number	Diff line number	Diff line
		@@ -34,30 +34,31 @@
		package android.hardware.biometrics.face;
		@Backing(type="byte") @VintfStability
		enum AcquiredInfo {
		GOOD = 0,
		INSUFFICIENT = 1,
		TOO_BRIGHT = 2,
		TOO_DARK = 3,
		TOO_CLOSE = 4,
		TOO_FAR = 5,
		FACE_TOO_HIGH = 6,
		FACE_TOO_LOW = 7,
		FACE_TOO_RIGHT = 8,
		FACE_TOO_LEFT = 9,
		POOR_GAZE = 10,
		NOT_DETECTED = 11,
		TOO_MUCH_MOTION = 12,
		RECALIBRATE = 13,
		TOO_DIFFERENT = 14,
		TOO_SIMILAR = 15,
		PAN_TOO_EXTREME = 16,
		TILT_TOO_EXTREME = 17,
		ROLL_TOO_EXTREME = 18,
		FACE_OBSCURED = 19,
		START = 20,
		SENSOR_DIRTY = 21,
		VENDOR = 22,
		FIRST_FRAME_RECEIVED = 23,
		DARK_GLASSES_DETECTED = 24,
		MOUTH_COVERING_DETECTED = 25,
		UNKNOWN = 0,
		GOOD = 1,
		INSUFFICIENT = 2,
		TOO_BRIGHT = 3,
		TOO_DARK = 4,
		TOO_CLOSE = 5,
		TOO_FAR = 6,
		FACE_TOO_HIGH = 7,
		FACE_TOO_LOW = 8,
		FACE_TOO_RIGHT = 9,
		FACE_TOO_LEFT = 10,
		POOR_GAZE = 11,
		NOT_DETECTED = 12,
		TOO_MUCH_MOTION = 13,
		RECALIBRATE = 14,
		TOO_DIFFERENT = 15,
		TOO_SIMILAR = 16,
		PAN_TOO_EXTREME = 17,
		TILT_TOO_EXTREME = 18,
		ROLL_TOO_EXTREME = 19,
		FACE_OBSCURED = 20,
		START = 21,
		SENSOR_DIRTY = 22,
		VENDOR = 23,
		FIRST_FRAME_RECEIVED = 24,
		DARK_GLASSES_DETECTED = 25,
		MOUTH_COVERING_DETECTED = 26,
		}

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/current/android/hardware/biometrics/face/BaseFrame.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@
		package android.hardware.biometrics.face;
		@VintfStability
		parcelable BaseFrame {
		android.hardware.biometrics.face.AcquiredInfo acquiredInfo = android.hardware.biometrics.face.AcquiredInfo.INSUFFICIENT;
		android.hardware.biometrics.face.AcquiredInfo acquiredInfo = android.hardware.biometrics.face.AcquiredInfo.UNKNOWN;
		int vendorCode;
		float pan;
		float tilt;