Snap for 4459973 from 3b3111d5ac923f78625a257dfde63c211a6ede94 to pi-release (c6eb790c) · Commits · e / os / platform_frameworks_native

cmds/dumpstate/dumpstate.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@ void add_mountinfo();
		#define PROFILE_DATA_DIR_CUR "/data/misc/profiles/cur"
		#define PROFILE_DATA_DIR_REF "/data/misc/profiles/ref"
		#define WLUTIL "/vendor/xbin/wlutil"
		#define WMTRACE_DATA_DIR "/data/misc/wmtrace"

		// TODO(narayan): Since this information has to be kept in sync
		// with tombstoned, we should just put it in a common header.
		@@ -1210,6 +1211,11 @@ static void dumpstate() {
		DumpFile("BINDER STATS", "/sys/kernel/debug/binder/stats");
		DumpFile("BINDER STATE", "/sys/kernel/debug/binder/state");

		/* Add window and surface trace files. */
		if (!PropertiesHelper::IsUserBuild()) {
		ds.AddDir(WMTRACE_DATA_DIR, false);
		}

		ds.DumpstateBoard();

		/* Migrate the ril_dumpstate to a device specific dumpstate? */

+10 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,15 @@ status_t Status::readFromParcel(const Parcel& parcel) {
		}
		mMessage = String8(message);

		// Skip over the remote stack trace data
		int32_t remote_stack_trace_header_size;
		status = parcel.readInt32(&remote_stack_trace_header_size);
		if (status != OK) {
		setFromStatusT(status);
		return status;
		}
		parcel.setDataPosition(parcel.dataPosition() + remote_stack_trace_header_size);

		if (mException == EX_SERVICE_SPECIFIC) {
		status = parcel.readInt32(&mErrorCode);
		} else if (mException == EX_PARCELABLE) {
		@@ -137,6 +146,7 @@ status_t Status::writeToParcel(Parcel* parcel) const {
		return status;
		}
		status = parcel->writeString16(String16(mMessage));
		status = parcel->writeInt32(0); // Empty remote stack trace header
		if (mException == EX_SERVICE_SPECIFIC) {
		status = parcel->writeInt32(mErrorCode);
		} else if (mException == EX_PARCELABLE) {

+27 −0

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

		#include <log/log.h>
		#include <nativeloader/dlext_namespaces.h>
		#include <nativeloader/native_loader.h>

		// TODO(b/37049319) Get this from a header once one exists
		extern "C" {
		@@ -45,6 +46,32 @@ void GraphicsEnv::setDriverPath(const std::string path) {
		mDriverPath = path;
		}

		void GraphicsEnv::setLayerPaths(android_namespace_t* appNamespace, const std::string layerPaths) {
		if (mLayerPaths.empty()) {
		mLayerPaths = layerPaths;
		mAppNamespace = appNamespace;
		} else {
		ALOGV("Vulkan layer search path already set, not clobbering with '%s' for namespace %p'",
		layerPaths.c_str(), appNamespace);
		}
		}

		android_namespace_t* GraphicsEnv::getAppNamespace() {
		return mAppNamespace;
		}

		const std::string GraphicsEnv::getLayerPaths(){
		return mLayerPaths;
		}

		const std::string GraphicsEnv::getDebugLayers() {
		return mDebugLayers;
		}

		void GraphicsEnv::setDebugLayers(const std::string layers) {
		mDebugLayers = layers;
		}

		android_namespace_t* GraphicsEnv::getDriverNamespace() {
		static std::once_flag once;
		std::call_once(once, [this]() {

+10 −0

Original line number	Diff line number	Diff line
		@@ -35,10 +35,20 @@ public:
		void setDriverPath(const std::string path);
		android_namespace_t* getDriverNamespace();

		void setLayerPaths(android_namespace_t* appNamespace, const std::string layerPaths);
		android_namespace_t* getAppNamespace();
		const std::string getLayerPaths();

		void setDebugLayers(const std::string layers);
		const std::string getDebugLayers();

		private:
		GraphicsEnv() = default;
		std::string mDriverPath;
		std::string mDebugLayers;
		std::string mLayerPaths;
		android_namespace_t* mDriverNamespace = nullptr;
		android_namespace_t* mAppNamespace = nullptr;
		};

		} // namespace android

+177 −137

File changed.

Preview size limit exceeded, changes collapsed.