Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dada5fd1 authored by Josh Gao's avatar Josh Gao Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I8d634811a847261bd186a9e66ede6b3ebc0d0f98
parents 9b07c52d 046cc119

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