Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]."

import android.content.Intent;

import android.content.IntentFilter;

import android.debug.AdbManager;

import android.debug.FingerprintAndPairDevice;

import android.debug.IAdbManager;

import android.debug.PairDevice;

import android.os.Build;

            mAdbManager = IAdbManager.Stub.asInterface(ServiceManager.getService(

                    Context.ADB_SERVICE));

            try {

                Map<String, PairDevice> newList = mAdbManager.getPairedDevices();

                updatePairedDevicePreferences(newList);

                FingerprintAndPairDevice[] newList = mAdbManager.getPairedDevices();

                Map<String, PairDevice> newMap = new HashMap<>();

                for (FingerprintAndPairDevice pair : newList) {

                    newMap.put(pair.keyFingerprint, pair.device);

                }

                updatePairedDevicePreferences(newMap);

                mConnectionPort = mAdbManager.getAdbWirelessPort();

                if (mConnectionPort > 0) {

                    Log.i(TAG, "onEnabled(): connect_port=" + mConnectionPort);