Snap for 4736748 from 564e3581cb72d117f25d2d729af2af922e86e0f1 to pi-release (cb08fa67) · Commits · e / os / android_system_core

adb/adb.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1222,7 +1222,7 @@ int handle_host_request(const char* service, TransportType type, const char* ser
		std::string error;
		atransport* t = acquire_one_transport(type, serial, transport_id, nullptr, &error);
		if (!t) {
		return SendFail(reply_fd, error);
		return -1;
		}

		int ret = handle_forward_request(service, t, reply_fd);

init/builtins.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -519,6 +519,7 @@ static Result<Success> queue_fs_event(int code) {
		if (e4crypt_install_keyring()) {
		return Error() << "e4crypt_install_keyring() failed";
		}
		property_set("ro.crypto.state", "encrypted");
		property_set("ro.crypto.type", "file");

		// Although encrypted, vold has already set the device up, so we do not need to

libmemunreachable/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,6 @@ cc_test {
		cc_test {
		name: "memunreachable_binder_test",
		defaults: ["libmemunreachable_defaults"],
		test_suites: ["vts"],
		srcs: [
		"tests/Binder_test.cpp",
		],

libmetricslogger/Android.bp

+7 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,13 @@ cc_library_shared {
		defaults: ["metricslogger_defaults"],
		}

		// static version of libmetricslogger, needed by a few art static binaries
		cc_library_static {
		name: "libmetricslogger_static",
		srcs: metricslogger_lib_src_files,
		defaults: ["metricslogger_defaults"],
		}

		// metricslogger shared library, debug
		// -----------------------------------------------------------------------------
		cc_library_shared {

libmetricslogger/include/metricslogger/metrics_logger.h

+41 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		* limitations under the License.
		*/

		#include <log/log_event_list.h>
		#include <cstdint>
		#include <string>

		@@ -32,6 +33,34 @@ void LogCounter(const std::string& name, int32_t val);
		// \|value\| in the field \|field\|.
		void LogMultiAction(int32_t category, int32_t field, const std::string& value);

		// Logs a Tron complex event.
		//
		// A complex event can include data in a structure not suppored by the other
		// log event types above.
		//
		// Note that instances of this class are single use. You must call Record()
		// to write the event to the event log.
		class ComplexEventLogger {
		private:
		android_log_event_list logger;

		public:
		// Create a complex event with category\|category\|.
		explicit ComplexEventLogger(int category);
		// Add tagged data to the event, with the given tag and integer value.
		void AddTaggedData(int tag, int32_t value);
		// Add tagged data to the event, with the given tag and string value.
		void AddTaggedData(int tag, const std::string& value);
		// Add tagged data to the event, with the given tag and integer value.
		void AddTaggedData(int tag, int64_t value);
		// Add tagged data to the event, with the given tag and float value.
		void AddTaggedData(int tag, float value);
		// Record this event. This method can only be used once per instance
		// of ComplexEventLogger. Do not made any subsequent calls to AddTaggedData
		// after recording an event.
		void Record();
		};

		// TODO: replace these with the metric_logger.proto definitions
		enum {
		LOGBUILDER_CATEGORY = 757,
		@@ -44,11 +73,23 @@ enum {

		ACTION_BOOT = 1098,
		FIELD_PLATFORM_REASON = 1099,

		ACTION_HIDDEN_API_ACCESSED = 1391,
		FIELD_HIDDEN_API_ACCESS_METHOD = 1392,
		FIELD_HIDDEN_API_ACCESS_DENIED = 1393,
		FIELD_HIDDEN_API_SIGNATURE = 1394,
		};

		enum {
		TYPE_ACTION = 4,
		};

		enum {
		ACCESS_METHOD_NONE = 0,
		ACCESS_METHOD_REFLECTION = 1,
		ACCESS_METHOD_JNI = 2,
		ACCESS_METHOD_LINKING = 3,
		};

		} // namespace metricslogger
		} // namespace android