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

Commit b2d6d25e 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 am: dada5fd1 

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

Change-Id: I917a3a1d8f51fa883565c4ec69fb43fd2699edc6
parents 9bbce096 dada5fd1

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