Snap for 8124529 from 390c0e9bf784711e4f4040f36d57d80dace70f58 to tm-d1-release (cb88e77e) · Commits · e / os / android_frameworks_native

cmds/dumpstate/tests/dumpstate_smoke_test.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -240,11 +240,11 @@ TEST_F(ZippedBugreportGenerationTest, Is1MBMBinSize) {
		EXPECT_GE(st.st_size, 1000000 /* 1MB */);
		}

		TEST_F(ZippedBugreportGenerationTest, TakesBetween30And300Seconds) {
		EXPECT_GE(duration, 30s) << "Expected completion in more than 30s. Actual time "
		<< duration.count() << " s.";
		TEST_F(ZippedBugreportGenerationTest, TakesBetween20And300Seconds) {
		EXPECT_GE(duration, 20s) << "Expected completion in more than 20s. Actual time "
		<< duration.count() << " ms.";
		EXPECT_LE(duration, 300s) << "Expected completion in less than 300s. Actual time "
		<< duration.count() << " s.";
		<< duration.count() << " ms.";
		}

		/**

+5 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,11 @@ cc_library_headers {
		"libstagefright_foundation_headers",
		],
		min_sdk_version: "29",
		apex_available: [
		"//apex_available:platform",
		"com.android.media",
		"com.android.media.swcodec",
		],

		host_supported: true,
		target: {

+1 −1

Original line number	Diff line number	Diff line
		@@ -164,7 +164,7 @@ enum {
		* (We want at least 10 but some touch controllers obstensibly configured for 10 pointers
		* will occasionally emit 11. There is not much harm making this constant bigger.)
		*/
		#define MAX_POINTERS 16
		static constexpr size_t MAX_POINTERS = 16;

		/*
		* Maximum number of samples supported per motion event.

+0 −18

Original line number	Diff line number	Diff line
		@@ -500,24 +500,6 @@ public:
		status_t sendTimeline(int32_t inputEventId,
		std::array<nsecs_t, GraphicsTimeline::SIZE> timeline);

		/* Returns true if there is a deferred event waiting.
		*
		* Should be called after calling consume() to determine whether the consumer
		* has a deferred event to be processed. Deferred events are somewhat special in
		* that they have already been removed from the input channel. If the input channel
		* becomes empty, the client may need to do extra work to ensure that it processes
		* the deferred event despite the fact that the input channel's file descriptor
		* is not readable.
		*
		* One option is simply to call consume() in a loop until it returns WOULD_BLOCK.
		* This guarantees that all deferred events will be processed.
		*
		* Alternately, the caller can call hasDeferredEvent() to determine whether there is
		* a deferred event waiting and then ensure that its event loop wakes up at least
		* one more time to consume the deferred event.
		*/
		bool hasDeferredEvent() const;

		/* Returns true if there is a pending batch.
		*
		* Should be called after calling consume() with consumeBatches == false to determine

+7 −0

Original line number	Diff line number	Diff line
		@@ -57,4 +57,11 @@ cc_library_static {
		},
		},
		min_sdk_version: "29",
		// static link, so it won't straddle a module boundary at runtime.
		apex_available: [
		"//apex_available:platform",
		"com.android.media",
		"com.android.media.swcodec",
		],

		}