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

Commit f31230d7 authored by Sherif Eid's avatar Sherif Eid
Browse files

Revert^2 "Reuse mHandler AdbKeyStore to fetch paired devices" 

Reason for revert: reverting changes after ag/35289549

Test: AdbDebuggingManagerTest
Test lunch sdk_gphone64_x86_64-trunk_staging-userdebug && m && ./prebuilts/android-emulator/linux-x86_64/emulator -wipe-data -show-kernel
Bug: 420613813
Flag: EXEMPT bugfix

Change-Id: Ib3910d34cd9e27e7db13b4776135261dc7fe41dc
parent 29a8d90c

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