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

Commit db592019 authored by Sherif Eid's avatar Sherif Eid Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Reuse mHandler AdbKeyStore to fetch paired devices"" into main

parents b9fd32e5 f31230d7

services/core/java/com/android/server/adb/AdbDebuggingManager.java

+1 −2
Original line number Diff line number Diff line
@@ -1446,8 +1446,7 @@ public class AdbDebuggingManager { 


    /** Returns the list of paired devices. */

    public Map<String, PairDevice> getPairedDevices() {

        AdbKeyStore keystore = new AdbKeyStore(mContext, mTempKeysFile, mUserKeyFile, mTicker);

        return getPairedDevicesForKeys(keystore.getKeys());

        return getPairedDevicesForKeys(mHandler.mAdbKeyStore.getKeys());

    }



    private Map<String, PairDevice> getPairedDevicesForKeys(Set<String> keys) {