| commit | b2d6d25eeb012f549c5558e404825c038ecd172e | [log] [tgz] |
|---|---|---|
| author | Josh Gao <jmgao@google.com> | Fri Jun 12 21:58:31 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 12 21:58:31 2020 +0000 |
| tree | 1e4923b86d6cdc5a1ff5b9ff0cbedd9bb973990c | |
| parent | 9bbce096b4c601134dabce5bba32812ff6b4f9be [diff] | |
| parent | dada5fd17e5da3f8f231b60722a81615ef33cfbb [diff] |
Merge "adb: avoid crash when authenticating without vendor keys." am: 046cc11982 am: dada5fd17e Original change: https://android-review.googlesource.com/c/platform/system/core/+/1331888 Change-Id: I917a3a1d8f51fa883565c4ec69fb43fd2699edc6
diff --git a/adb/transport.cpp b/adb/transport.cpp index b6b6984..c33d5af 100644 --- a/adb/transport.cpp +++ b/adb/transport.cpp
@@ -1533,8 +1533,7 @@ keys_.pop_front(); } - std::shared_ptr<RSA> result = keys_[0]; - return result; + return Key(); } void atransport::ResetKeys() {