Merge tag 'android-6.0.1_r22' of... (a98331d1) · Commits · e / os / android_frameworks_native

cmds/atrace/atrace.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@ static const TracingCategory k_categories[] = {
		{ "sched", "CPU Scheduling", 0, {
		{ REQ, "/sys/kernel/debug/tracing/events/sched/sched_switch/enable" },
		{ REQ, "/sys/kernel/debug/tracing/events/sched/sched_wakeup/enable" },
		{ OPT, "/sys/kernel/debug/tracing/events/sched/sched_blocked_reason/enable" },
		} },
		{ "irq", "IRQ Events", 0, {
		{ REQ, "/sys/kernel/debug/tracing/events/irq/enable" },

cmds/dumpstate/dumpstate.c

+11 −6

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ static char screenshot_path[PATH_MAX] = "";

		#define PSTORE_LAST_KMSG "/sys/fs/pstore/console-ramoops"

		#define RAFT_DIR "/data/misc/raft/"
		#define TOMBSTONE_DIR "/data/tombstones"
		#define TOMBSTONE_FILE_PREFIX TOMBSTONE_DIR "/tombstone_"
		/* Can accomodate a tombstone number up to 9999. */
		@@ -261,6 +262,8 @@ static unsigned long logcat_timeout(char *name) {

		/* End copy from system/core/logd/LogBuffer.cpp */

		static const unsigned long logcat_min_timeout = 40000; /* ms */

		/* dumps the current system state to stdout */
		static void dumpstate() {
		unsigned long timeout;
		@@ -333,23 +336,25 @@ static void dumpstate() {
		// dump_file("EVENT LOG TAGS", "/etc/event-log-tags");
		// calculate timeout
		timeout = logcat_timeout("main") + logcat_timeout("system") + logcat_timeout("crash");
		if (timeout < 20000) {
		timeout = 20000;
		if (timeout < logcat_min_timeout) {
		timeout = logcat_min_timeout;
		}
		run_command("SYSTEM LOG", timeout / 1000, "logcat", "-v", "threadtime", "-d", "*:v", NULL);
		timeout = logcat_timeout("events");
		if (timeout < 20000) {
		timeout = 20000;
		if (timeout < logcat_min_timeout) {
		timeout = logcat_min_timeout;
		}
		run_command("EVENT LOG", timeout / 1000, "logcat", "-b", "events", "-v", "threadtime", "-d", "*:v", NULL);
		timeout = logcat_timeout("radio");
		if (timeout < 20000) {
		timeout = 20000;
		if (timeout < logcat_min_timeout) {
		timeout = logcat_min_timeout;
		}
		run_command("RADIO LOG", timeout / 1000, "logcat", "-b", "radio", "-v", "threadtime", "-d", "*:v", NULL);

		run_command("LOG STATISTICS", 10, "logcat", "-b", "all", "-S", NULL);

		run_command("RAFT LOGS", 600, SU_PATH, "root", "logcompressor", "-r", RAFT_DIR, NULL);

		/* show the traces we collected in main(), if that was done */
		if (dump_traces_path != NULL) {
		dump_file("VM TRACES JUST NOW", dump_traces_path);

cmds/installd/commands.cpp

+5 −18

Original line number	Diff line number	Diff line
		@@ -771,24 +771,11 @@ static void run_dex2oat(int zip_fd, int oat_fd, const char* input_file_name,
		dex2oat_compiler_filter_flag, NULL) > 0;

		char dex2oat_threads_buf[PROPERTY_VALUE_MAX];
		bool have_dex2oat_threads_flag = false;
		if (!post_bootcomplete) {
		have_dex2oat_threads_flag = property_get("dalvik.vm.boot-dex2oat-threads",
		bool have_dex2oat_threads_flag = property_get(post_bootcomplete
		? "dalvik.vm.dex2oat-threads"
		: "dalvik.vm.boot-dex2oat-threads",
		dex2oat_threads_buf,
		NULL) > 0;
		// If there's no boot property, fall back to the image property.
		if (!have_dex2oat_threads_flag) {
		have_dex2oat_threads_flag = property_get("dalvik.vm.image-dex2oat-threads",
		dex2oat_threads_buf,
		NULL) > 0;
		}
		// If there's neither, fall back to the default property.
		}
		if (!have_dex2oat_threads_flag) {
		have_dex2oat_threads_flag = property_get("dalvik.vm.dex2oat-threads",
		dex2oat_threads_buf,
		NULL) > 0;
		}
		char dex2oat_threads_arg[PROPERTY_VALUE_MAX + 2];
		if (have_dex2oat_threads_flag) {
		sprintf(dex2oat_threads_arg, "-j%s", dex2oat_threads_buf);

include/android/keycodes.h

+16 −1

Original line number	Diff line number	Diff line
		@@ -722,7 +722,22 @@ enum {
		AKEYCODE_NAVIGATE_PREVIOUS = 260,
		AKEYCODE_NAVIGATE_NEXT = 261,
		AKEYCODE_NAVIGATE_IN = 262,
		AKEYCODE_NAVIGATE_OUT = 263
		AKEYCODE_NAVIGATE_OUT = 263,
		/** Primary stem key for Wear
		* Main power/reset button on watch. */
		AKEYCODE_STEM_PRIMARY = 264,
		/** Generic stem key 1 for Wear */
		AKEYCODE_STEM_1 = 265,
		/** Generic stem key 2 for Wear */
		AKEYCODE_STEM_2 = 266,
		/** Generic stem key 3 for Wear */
		AKEYCODE_STEM_3 = 267,
		AKEYCODE_MEDIA_SKIP_FORWARD = 272,
		AKEYCODE_MEDIA_SKIP_BACKWARD = 273,
		AKEYCODE_MEDIA_STEP_FORWARD = 274,
		AKEYCODE_MEDIA_STEP_BACKWARD = 275,
		/** Put device to sleep unless a wakelock is held. */
		AKEYCODE_SOFT_SLEEP = 276

		// NOTE: If you add a new keycode here you must also add it to several other files.
		// Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

include/input/InputEventLabels.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -303,6 +303,15 @@ static const InputEventLabel KEYCODES[] = {
		DEFINE_KEYCODE(NAVIGATE_NEXT),
		DEFINE_KEYCODE(NAVIGATE_IN),
		DEFINE_KEYCODE(NAVIGATE_OUT),
		DEFINE_KEYCODE(STEM_PRIMARY),
		DEFINE_KEYCODE(STEM_1),
		DEFINE_KEYCODE(STEM_2),
		DEFINE_KEYCODE(STEM_3),
		DEFINE_KEYCODE(MEDIA_SKIP_FORWARD),
		DEFINE_KEYCODE(MEDIA_SKIP_BACKWARD),
		DEFINE_KEYCODE(MEDIA_STEP_FORWARD),
		DEFINE_KEYCODE(MEDIA_STEP_BACKWARD),
		DEFINE_KEYCODE(SOFT_SLEEP),

		{ NULL, 0 }
		};