Commit 2e3b8be6 authored Aug 15, 2020 by Treehugger Robot Committed by Automerger Merge Worker Aug 15, 2020

Merge "Revert "[adb] fix signature check"" am: 920393dd am: ce5e6039

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1401071

Change-Id: I4b67ecebf31833037880b0539713bcbccc7601b4

adb/client/incremental.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -122,7 +122,7 @@ static unique_fd start_install(const Files& files, const Args& passthrough_args,
		}

		auto [signature_fd, signature] = read_and_encode_signature(st.st_size, file, silent);
		if (!signature_fd.ok() \|\| signature.empty()) {
		if (signature_fd.ok() && signature.empty()) {
		return {};
		}