Snap for 7280565 from 31dfd6a47bc0f66d0d74d5bea0fb95e51e578827 to sc-d1-release (a1f9127a) · Commits · e / devices / smdk4412 / android_frameworks_native

cmds/dumpstate/tests/dumpstate_test.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -1032,12 +1032,12 @@ class ZippedBugReportStreamTest : public DumpstateBaseTest {
		ZipArchiveHandle handle_;
		};

		// Generate a quick wifi report redirected to a file, open it and verify entry exist.
		TEST_F(ZippedBugReportStreamTest, StreamWifiReport) {
		std::string out_path = kTestDataPath + "out.zip";
		// Generate a quick LimitedOnly report redirected to a file, open it and verify entry exist.
		TEST_F(ZippedBugReportStreamTest, StreamLimitedOnlyReport) {
		std::string out_path = kTestDataPath + "StreamLimitedOnlyReportOut.zip";
		android::base::unique_fd out_fd;
		CreateFd(out_path, &out_fd);
		ds_.options_->wifi_only = true;
		ds_.options_->limited_only = true;
		ds_.options_->stream_to_socket = true;
		RedirectOutputToFd(out_fd);

		@@ -1051,7 +1051,7 @@ TEST_F(ZippedBugReportStreamTest, StreamWifiReport) {
		ExtractToMemory(handle_, &entry, reinterpret_cast<uint8_t*>(bugreport_txt_name.data()),
		entry.uncompressed_length);
		EXPECT_THAT(bugreport_txt_name,
		testing::ContainsRegex("(bugreport-.+-wifi(-[[:digit:]]+){6}\\.txt)"));
		testing::ContainsRegex("(bugreport-.+(-[[:digit:]]+){6}\\.txt)"));
		VerifyEntry(handle_, bugreport_txt_name, &entry);
		}

cmds/surfacereplayer/proto/src/trace.proto

+0 −6

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ message SurfaceChange {
		HiddenFlagChange hidden_flag = 12;
		OpaqueFlagChange opaque_flag = 13;
		SecureFlagChange secure_flag = 14;
		DeferredTransactionChange deferred_transaction = 15;
		CornerRadiusChange corner_radius = 16;
		ReparentChange reparent = 17;
		RelativeParentChange relative_parent = 18;
		@@ -113,11 +112,6 @@ message SecureFlagChange {
		required bool secure_flag = 1;
		}

		message DeferredTransactionChange {
		required int32 layer_id = 1;
		required uint64 frame_number = 2;
		}

		message DisplayChange {
		required int32 id = 1;

cmds/surfacereplayer/replayer/Replayer.cpp

+0 −25

Original line number	Diff line number	Diff line
		@@ -402,11 +402,6 @@ status_t Replayer::doSurfaceTransaction(
		case SurfaceChange::SurfaceChangeCase::kSecureFlag:
		setSecureFlag(transaction, change.id(), change.secure_flag());
		break;
		case SurfaceChange::SurfaceChangeCase::kDeferredTransaction:
		waitUntilDeferredTransactionLayerExists(change.deferred_transaction(), lock);
		setDeferredTransaction(transaction, change.id(),
		change.deferred_transaction());
		break;
		case SurfaceChange::SurfaceChangeCase::kReparent:
		setReparentChange(transaction, change.id(), change.reparent());
		break;
		@@ -560,19 +555,6 @@ void Replayer::setSecureFlag(SurfaceComposerClient::Transaction& t,
		t.setFlags(mLayers[id], flag, layer_state_t::eLayerSecure);
		}

		void Replayer::setDeferredTransaction(SurfaceComposerClient::Transaction& t,
		layer_id id, const DeferredTransactionChange& dtc) {
		ALOGV("Layer %d: Setting Deferred Transaction -- layer_id=%d, "
		"frame_number=%llu",
		id, dtc.layer_id(), dtc.frame_number());
		if (mLayers.count(dtc.layer_id()) == 0 \|\| mLayers[dtc.layer_id()] == nullptr) {
		ALOGE("Layer %d not found in Deferred Transaction", dtc.layer_id());
		return;
		}

		t.deferTransactionUntil_legacy(mLayers[id], mLayers[dtc.layer_id()], dtc.frame_number());
		}

		void Replayer::setDisplaySurface(SurfaceComposerClient::Transaction& t,
		display_id id, const DispSurfaceChange& /dsc/) {
		sp<IGraphicBufferProducer> outProducer;
		@@ -676,13 +658,6 @@ void Replayer::waitUntilTimestamp(int64_t timestamp) {
		std::this_thread::sleep_for(std::chrono::nanoseconds(timestamp - mCurrentTime));
		}

		void Replayer::waitUntilDeferredTransactionLayerExists(
		const DeferredTransactionChange& dtc, std::unique_lock<std::mutex>& lock) {
		if (mLayers.count(dtc.layer_id()) == 0 \|\| mLayers[dtc.layer_id()] == nullptr) {
		mLayerCond.wait(lock, [&] { return (mLayers[dtc.layer_id()] != nullptr); });
		}
		}

		status_t Replayer::loadSurfaceComposerClient() {
		mComposerClient = new SurfaceComposerClient;
		return mComposerClient->initCheck();

cmds/surfacereplayer/replayer/Replayer.h

+0 −4

Original line number	Diff line number	Diff line
		@@ -110,8 +110,6 @@ class Replayer {
		layer_id id, const OpaqueFlagChange& ofc);
		void setSecureFlag(SurfaceComposerClient::Transaction& t,
		layer_id id, const SecureFlagChange& sfc);
		void setDeferredTransaction(SurfaceComposerClient::Transaction& t,
		layer_id id, const DeferredTransactionChange& dtc);
		void setReparentChange(SurfaceComposerClient::Transaction& t,
		layer_id id, const ReparentChange& c);
		void setRelativeParentChange(SurfaceComposerClient::Transaction& t,
		@@ -131,8 +129,6 @@ class Replayer {
		display_id id, const ProjectionChange& pc);

		void waitUntilTimestamp(int64_t timestamp);
		void waitUntilDeferredTransactionLayerExists(
		const DeferredTransactionChange& dtc, std::unique_lock<std::mutex>& lock);
		status_t loadSurfaceComposerClient();

		Trace mTrace;

include/android/bitmap.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -241,6 +241,7 @@ typedef struct AHardwareBuffer AHardwareBuffer;
		*
		* Available since API level 30.
		*
		* @param env Handle to the JNI environment pointer.
		* @param bitmap Handle to an android.graphics.Bitmap.
		* @param outBuffer On success, is set to a pointer to the
		* {@link AHardwareBuffer} associated with bitmap. This acquires