Commit 5f2aabf0 authored Jun 12, 2020 by Josh Gao Committed by Automerger Merge Worker Jun 12, 2020

Merge "adb: avoid crash when authenticating without vendor keys." am:...

Merge "adb: avoid crash when authenticating without vendor keys." am: 046cc119 am: dada5fd1 am: b2d6d25e am: ad5f8f4a

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

Change-Id: Ie96b7461f437e2d38bc49d16fa707d520c7677dc

adb/transport.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -1533,8 +1533,7 @@ std::shared_ptr<RSA> atransport::NextKey() {
		keys_.pop_front();
		}

		std::shared_ptr<RSA> result = keys_[0];
		return result;
		return Key();
		}

		void atransport::ResetKeys() {