openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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

Change-Id: I8d634811a847261bd186a9e66ede6b3ebc0d0f98
This commit is contained in:
Josh Gao 2020-06-12 21:51:30 +00:00 committed by Automerger Merge Worker
parent 9b07c52de0 046cc11982
commit dada5fd17e
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
adb/transport.cpp
View File

@ -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() {