Snap for 6374687 from 8aea79013448caab444bb6d43de5eb4199774e10 to rvc-release (1a39352a) · Commits · e / os / android_frameworks_native

cmds/atrace/atrace.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -233,6 +233,7 @@ static const TracingCategory k_categories[] = {
		{ REQ, "events/filemap/enable" },
		} },
		{ "memory", "Memory", 0, {
		{ OPT, "events/mm_event/mm_event_record/enable" },
		{ OPT, "events/kmem/rss_stat/enable" },
		{ OPT, "events/kmem/ion_heap_grow/enable" },
		{ OPT, "events/kmem/ion_heap_shrink/enable" },

cmds/atrace/atrace.rc

+2 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,8 @@ on late-init
		chmod 0666 /sys/kernel/tracing/events/kmem/ion_heap_grow/enable
		chmod 0666 /sys/kernel/debug/tracing/events/kmem/ion_heap_shrink/enable
		chmod 0666 /sys/kernel/tracing/events/kmem/ion_heap_shrink/enable
		chmod 0666 /sys/kernel/debug/tracing/events/mm_event/mm_event_record/enable
		chmod 0666 /sys/kernel/tracing/events/mm_event/mm_event_record/enable
		chmod 0666 /sys/kernel/debug/tracing/events/signal/signal_generate/enable
		chmod 0666 /sys/kernel/tracing/events/signal/signal_generate/enable
		chmod 0666 /sys/kernel/debug/tracing/events/signal/signal_deliver/enable

cmds/installd/dexopt.cpp

+9 −0

Original line number	Diff line number	Diff line
		@@ -374,6 +374,14 @@ class RunDex2Oat : public ExecVHelper {
		bool skip_compilation = vold_decrypt == "trigger_restart_min_framework" \|\|
		vold_decrypt == "1";

		std::string updatable_bcp_packages =
		MapPropertyToArg("dalvik.vm.dex2oat-updatable-bcp-packages-file",
		"--updatable-bcp-packages-file=%s");
		if (updatable_bcp_packages.empty()) {
		// Make dex2oat fail by providing non-existent file name.
		updatable_bcp_packages = "--updatable-bcp-packages-file=/nonx/updatable-bcp-packages.txt";
		}

		std::string resolve_startup_string_arg =
		MapPropertyToArg("persist.device_config.runtime.dex2oat_resolve_startup_strings",
		"--resolve-startup-const-strings=%s");
		@@ -520,6 +528,7 @@ class RunDex2Oat : public ExecVHelper {
		AddRuntimeArg(dex2oat_Xms_arg);
		AddRuntimeArg(dex2oat_Xmx_arg);

		AddArg(updatable_bcp_packages);
		AddArg(resolve_startup_string_arg);
		AddArg(image_block_size_arg);
		AddArg(dex2oat_compiler_filter_arg);

libs/binder/tests/Android.bp

+3 −3

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ cc_test {
		},

		srcs: ["binderDriverInterfaceTest.cpp"],
		test_suites: ["device-tests", "vts-core"],
		test_suites: ["device-tests", "vts"],
		}

		cc_test {
		@@ -69,7 +69,7 @@ cc_test {
		"libbinder",
		"libutils",
		],
		test_suites: ["device-tests", "vts-core"],
		test_suites: ["device-tests", "vts"],
		require_root: true,
		}

		@@ -131,7 +131,7 @@ cc_test {
		"liblog",
		"libutils",
		],
		test_suites: ["device-tests", "vts-core"],
		test_suites: ["device-tests", "vts"],
		require_root: true,
		}

libs/gui/ISurfaceComposer.cpp

+46 −0

Original line number	Diff line number	Diff line
		@@ -1145,6 +1145,42 @@ public:
		ALOGE("setFrameRate: failed to transact: %s (%d)", strerror(-err), err);
		return err;
		}

		return reply.readInt32();
		}

		virtual status_t acquireFrameRateFlexibilityToken(sp<IBinder>* outToken) {
		if (!outToken) return BAD_VALUE;

		Parcel data, reply;
		status_t err = data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
		if (err != NO_ERROR) {
		ALOGE("acquireFrameRateFlexibilityToken: failed writing interface token: %s (%d)",
		strerror(-err), -err);
		return err;
		}

		err = remote()->transact(BnSurfaceComposer::ACQUIRE_FRAME_RATE_FLEXIBILITY_TOKEN, data,
		&reply);
		if (err != NO_ERROR) {
		ALOGE("acquireFrameRateFlexibilityToken: failed to transact: %s (%d)", strerror(-err),
		err);
		return err;
		}

		err = reply.readInt32();
		if (err != NO_ERROR) {
		ALOGE("acquireFrameRateFlexibilityToken: call failed: %s (%d)", strerror(-err), err);
		return err;
		}

		err = reply.readStrongBinder(outToken);
		if (err != NO_ERROR) {
		ALOGE("acquireFrameRateFlexibilityToken: failed reading binder token: %s (%d)",
		strerror(-err), err);
		return err;
		}

		return NO_ERROR;
		}
		};
		@@ -1945,6 +1981,16 @@ status_t BnSurfaceComposer::onTransact(
		reply->writeInt32(result);
		return NO_ERROR;
		}
		case ACQUIRE_FRAME_RATE_FLEXIBILITY_TOKEN: {
		CHECK_INTERFACE(ISurfaceComposer, data, reply);
		sp<IBinder> token;
		status_t result = acquireFrameRateFlexibilityToken(&token);
		reply->writeInt32(result);
		if (result == NO_ERROR) {
		reply->writeStrongBinder(token);
		}
		return NO_ERROR;
		}
		default: {
		return BBinder::onTransact(code, data, reply, flags);
		}