Merge "dump callstack on Surface use error" (90f96b83) · Commits · e / os / android_frameworks_native

include/utils/CallStack.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ public:

		void clear();

		void update(int32_t ignoreDepth=0, int32_t maxDepth=MAX_DEPTH);
		void update(int32_t ignoreDepth=1, int32_t maxDepth=MAX_DEPTH);

		// Dump a stack trace to the log
		void dump(const char* prefix = 0) const;

+6 −0

Original line number	Diff line number	Diff line
		@@ -489,6 +489,9 @@ status_t Surface::validate() const
		LOGE("[Surface] using an invalid surface, "
		"identity=%u should be %d",
		mIdentity, identity);
		CallStack stack;
		stack.update();
		stack.dump("Surface");
		return NO_INIT;
		}

		@@ -497,6 +500,9 @@ status_t Surface::validate() const
		if (err != NO_ERROR) {
		LOGE("surface (identity=%u) is invalid, err=%d (%s)",
		mIdentity, err, strerror(-err));
		CallStack stack;
		stack.update();
		stack.dump("Surface");
		return err;
		}