Snap for 4641295 from 3a7e825dc64e6903b441023d7534664b8f105c8c to pi-release (f38ffa5c) · Commits · e / os / android_frameworks_native

cmds/dumpstate/Android.bp

+2 −1

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@ cc_defaults {
		"libdebuggerd_client",
		"libdumpstateaidl",
		"libdumpstateutil",
		"libdumputils",
		"libhidlbase",
		"libhidltransport",
		"liblog",

cmds/dumpstate/utils.cpp

+1 −90

Original line number	Diff line number	Diff line
		@@ -48,10 +48,10 @@
		#include <android-base/stringprintf.h>
		#include <android-base/strings.h>
		#include <android-base/unique_fd.h>
		#include <android/hidl/manager/1.0/IServiceManager.h>
		#include <cutils/properties.h>
		#include <cutils/sockets.h>
		#include <debuggerd/client.h>
		#include <dumputils/dump_utils.h>
		#include <log/log.h>
		#include <private/android_filesystem_config.h>

		@@ -76,36 +76,6 @@ static int RunCommand(const std::string& title, const std::vector<std::string>&
		return ds.RunCommand(title, full_command, options);
		}

		/* list of native processes to include in the native dumps */
		// This matches the /proc/pid/exe link instead of /proc/pid/cmdline.
		static const char* native_processes_to_dump[] = {
		"/system/bin/audioserver",
		"/system/bin/cameraserver",
		"/system/bin/drmserver",
		"/system/bin/mediadrmserver",
		"/system/bin/mediaextractor", // media.extractor
		"/system/bin/mediametrics", // media.metrics
		"/system/bin/mediaserver",
		"/system/bin/sdcard",
		"/system/bin/statsd",
		"/system/bin/surfaceflinger",
		"/system/bin/vehicle_network_service",
		"/vendor/bin/hw/android.hardware.media.omx@1.0-service", // media.codec
		NULL,
		};

		/* list of hal interface to dump containing process during native dumps */
		static const char* hal_interfaces_to_dump[] {
		"android.hardware.audio@2.0::IDevicesFactory",
		"android.hardware.bluetooth@1.0::IBluetoothHci",
		"android.hardware.camera.provider@2.4::ICameraProvider",
		"android.hardware.graphics.composer@2.1::IComposer",
		"android.hardware.media.omx@1.0::IOmx",
		"android.hardware.sensors@1.0::ISensors",
		"android.hardware.vr@1.0::IVr",
		NULL,
		};

		// Reasonable value for max stats.
		static const int STATS_MAX_N_RUNS = 1000;
		static const long STATS_MAX_AVERAGE = 100000;
		@@ -809,53 +779,6 @@ void redirect_to_existing_file(FILE redirect, char path) {
		_redirect_to_file(redirect, path, O_APPEND);
		}

		static bool should_dump_hal_interface(const char* interface) {
		for (const char** i = hal_interfaces_to_dump; *i; i++) {
		if (!strcmp(*i, interface)) {
		return true;
		}
		}
		return false;
		}

		static bool should_dump_native_traces(const char* path) {
		for (const char** p = native_processes_to_dump; *p; p++) {
		if (!strcmp(*p, path)) {
		return true;
		}
		}
		return false;
		}

		std::set<int> get_interesting_hal_pids() {
		using android::hidl::manager::V1_0::IServiceManager;
		using android::sp;
		using android::hardware::Return;

		sp<IServiceManager> manager = IServiceManager::getService();
		std::set<int> pids;

		Return<void> ret = manager->debugDump([&](auto& hals) {
		for (const auto &info : hals) {
		if (info.pid == static_cast<int>(IServiceManager::PidConstant::NO_PID)) {
		continue;
		}

		if (!should_dump_hal_interface(info.interfaceName.c_str())) {
		continue;
		}

		pids.insert(info.pid);
		}
		});

		if (!ret.isOk()) {
		MYLOGE("Could not get list of HAL PIDs: %s\n", ret.description().c_str());
		}

		return pids; // whether it was okay or not
		}

		const char* DumpTraces(const std::string& traces_path);
		const char* DumpTracesTombstoned(const std::string& traces_dir);

		@@ -876,18 +799,6 @@ const char *dump_traces() {
		return nullptr;
		}

		static bool IsZygote(int pid) {
		static const std::string kZygotePrefix = "zygote";

		std::string cmdline;
		if (!android::base::ReadFileToString(android::base::StringPrintf("/proc/%d/cmdline", pid),
		&cmdline)) {
		return true;
		}

		return (cmdline.find(kZygotePrefix) == 0);
		}

		const char* DumpTracesTombstoned(const std::string& traces_dir) {
		const std::string temp_file_pattern = traces_dir + "/dumptrace_XXXXXX";

data/etc/wearable_core_hardware.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -36,9 +36,6 @@
		<!-- basic system services -->
		<feature name="android.software.home_screen" />

		<!-- device administration -->
		<feature name="android.software.device_admin" />

		<!-- input management and third-party input method editors -->
		<feature name="android.software.input_methods" />

libs/dumputils/Android.bp

0 → 100644

+34 −0

Original line number	Diff line number	Diff line
		// Copyright (C) 2018 The Android Open Source Project
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.

		cc_library {
		name: "libdumputils",

		shared_libs: [
		"libbase",
		"libbinder",
		"libhidlbase",
		"libhidltransport",
		"liblog",
		"libutils",
		],

		srcs: ["dump_utils.cpp"],

		cflags: ["-Wall", "-Werror"],

		export_include_dirs: [
		"include",
		],
		}

libs/dumputils/dump_utils.cpp

0 → 100644

+111 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2018 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		#include <set>

		#include <android-base/file.h>
		#include <android-base/stringprintf.h>
		#include <android/hidl/manager/1.0/IServiceManager.h>
		#include <dumputils/dump_utils.h>
		#include <log/log.h>

		/* list of native processes to include in the native dumps */
		// This matches the /proc/pid/exe link instead of /proc/pid/cmdline.
		static const char* native_processes_to_dump[] = {
		"/system/bin/audioserver",
		"/system/bin/cameraserver",
		"/system/bin/drmserver",
		"/system/bin/mediadrmserver",
		"/system/bin/mediaextractor", // media.extractor
		"/system/bin/mediametrics", // media.metrics
		"/system/bin/mediaserver",
		"/system/bin/sdcard",
		"/system/bin/statsd",
		"/system/bin/surfaceflinger",
		"/system/bin/vehicle_network_service",
		"/vendor/bin/hw/android.hardware.media.omx@1.0-service", // media.codec
		NULL,
		};

		/* list of hal interface to dump containing process during native dumps */
		static const char* hal_interfaces_to_dump[] {
		"android.hardware.audio@2.0::IDevicesFactory",
		"android.hardware.bluetooth@1.0::IBluetoothHci",
		"android.hardware.camera.provider@2.4::ICameraProvider",
		"android.hardware.graphics.composer@2.1::IComposer",
		"android.hardware.media.omx@1.0::IOmx",
		"android.hardware.sensors@1.0::ISensors",
		"android.hardware.vr@1.0::IVr",
		NULL,
		};

		bool should_dump_hal_interface(const char* interface) {
		for (const char** i = hal_interfaces_to_dump; *i; i++) {
		if (!strcmp(*i, interface)) {
		return true;
		}
		}
		return false;
		}

		bool should_dump_native_traces(const char* path) {
		for (const char** p = native_processes_to_dump; *p; p++) {
		if (!strcmp(*p, path)) {
		return true;
		}
		}
		return false;
		}

		std::set<int> get_interesting_hal_pids() {
		using android::hidl::manager::V1_0::IServiceManager;
		using android::sp;
		using android::hardware::Return;

		sp<IServiceManager> manager = IServiceManager::getService();
		std::set<int> pids;

		Return<void> ret = manager->debugDump([&](auto& hals) {
		for (const auto &info : hals) {
		if (info.pid == static_cast<int>(IServiceManager::PidConstant::NO_PID)) {
		continue;
		}

		if (!should_dump_hal_interface(info.interfaceName.c_str())) {
		continue;
		}

		pids.insert(info.pid);
		}
		});

		if (!ret.isOk()) {
		ALOGE("Could not get list of HAL PIDs: %s\n", ret.description().c_str());
		}

		return pids; // whether it was okay or not
		}

		bool IsZygote(int pid) {
		static const std::string kZygotePrefix = "zygote";

		std::string cmdline;
		if (!android::base::ReadFileToString(android::base::StringPrintf("/proc/%d/cmdline", pid),
		&cmdline)) {
		return true;
		}

		return (cmdline.find(kZygotePrefix) == 0);
		}