Snap for 4680594 from ccd348460ca25890a8fb709e82e6f780e3ce878e to pi-release (07c712a1) · Commits · e / os / android_frameworks_native

cmds/dumpstate/dumpstate.cpp

+5 −13

Original line number	Diff line number	Diff line
		@@ -1159,6 +1159,10 @@ static void RunDumpsysTextNormalPriority(const std::string& title,
		static void RunDumpsysProto(const std::string& title, int priority,
		std::chrono::milliseconds timeout,
		std::chrono::milliseconds service_timeout) {
		if (!ds.IsZipping()) {
		MYLOGD("Not dumping %s because it's not a zipped bugreport\n", title.c_str());
		return;
		}
		sp<android::IServiceManager> sm = defaultServiceManager();
		Dumpsys dumpsys(sm.get());
		Vector<String16> args;
		@@ -1630,20 +1634,8 @@ static void ExitOnInvalidArgs() {
		ShowUsageAndExit();
		}

		static void sig_handler(int) {
		_exit(EXIT_FAILURE);
		}

		static void register_sig_handler() {
		struct sigaction sa;
		sigemptyset(&sa.sa_mask);
		sa.sa_flags = 0;
		sa.sa_handler = sig_handler;
		sigaction(SIGPIPE, &sa, NULL); // broken pipe
		sigaction(SIGSEGV, &sa, NULL); // segment fault
		sigaction(SIGINT, &sa, NULL); // ctrl-c
		sigaction(SIGTERM, &sa, NULL); // killed
		sigaction(SIGQUIT, &sa, NULL); // quit
		signal(SIGPIPE, SIG_IGN);
		}

		bool Dumpstate::FinishZipFile() {

+2 −2

Original line number	Diff line number	Diff line
		@@ -47,8 +47,8 @@ public:
		~BpSurfaceComposerClient() override;

		status_t createSurface(const String8& name, uint32_t width, uint32_t height, PixelFormat format,
		uint32_t flags, const sp<IBinder>& parent, uint32_t windowType,
		uint32_t ownerUid, sp<IBinder>* handle,
		uint32_t flags, const sp<IBinder>& parent, int32_t windowType,
		int32_t ownerUid, sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp) override {
		return callRemote<decltype(&ISurfaceComposerClient::createSurface)>(Tag::CREATE_SURFACE,
		name, width, height,

+4 −4

Original line number	Diff line number	Diff line
		@@ -609,8 +609,8 @@ sp<SurfaceControl> SurfaceComposerClient::createSurface(
		PixelFormat format,
		uint32_t flags,
		SurfaceControl* parent,
		uint32_t windowType,
		uint32_t ownerUid)
		int32_t windowType,
		int32_t ownerUid)
		{
		sp<SurfaceControl> s;
		createSurfaceChecked(name, w, h, format, &s, flags, parent, windowType, ownerUid);
		@@ -625,8 +625,8 @@ status_t SurfaceComposerClient::createSurfaceChecked(
		sp<SurfaceControl>* outSurface,
		uint32_t flags,
		SurfaceControl* parent,
		uint32_t windowType,
		uint32_t ownerUid)
		int32_t windowType,
		int32_t ownerUid)
		{
		sp<SurfaceControl> sur;
		status_t err = NO_ERROR;

+2 −2

Original line number	Diff line number	Diff line
		@@ -49,8 +49,8 @@ public:
		* Requires ACCESS_SURFACE_FLINGER permission
		*/
		virtual status_t createSurface(const String8& name, uint32_t w, uint32_t h, PixelFormat format,
		uint32_t flags, const sp<IBinder>& parent, uint32_t windowType,
		uint32_t ownerUid, sp<IBinder>* handle,
		uint32_t flags, const sp<IBinder>& parent, int32_t windowType,
		int32_t ownerUid, sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp) = 0;

		/*

+4 −4

Original line number	Diff line number	Diff line
		@@ -111,8 +111,8 @@ public:
		PixelFormat format, // pixel-format desired
		uint32_t flags = 0, // usage flags
		SurfaceControl* parent = nullptr, // parent
		uint32_t windowType = 0, // from WindowManager.java (STATUS_BAR, INPUT_METHOD, etc.)
		uint32_t ownerUid = 0 // UID of the task
		int32_t windowType = -1, // from WindowManager.java (STATUS_BAR, INPUT_METHOD, etc.)
		int32_t ownerUid = -1 // UID of the task
		);

		status_t createSurfaceChecked(
		@@ -123,8 +123,8 @@ public:
		sp<SurfaceControl>* outSurface,
		uint32_t flags = 0, // usage flags
		SurfaceControl* parent = nullptr, // parent
		uint32_t windowType = 0, // from WindowManager.java (STATUS_BAR, INPUT_METHOD, etc.)
		uint32_t ownerUid = 0 // UID of the task
		int32_t windowType = -1, // from WindowManager.java (STATUS_BAR, INPUT_METHOD, etc.)
		int32_t ownerUid = -1 // UID of the task
		);

		//! Create a virtual display