Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]."
This commit is contained in:
@@ -23,6 +23,7 @@ import android.content.Context;
|
||||
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;
|
||||
@@ -310,8 +311,12 @@ public class WirelessDebuggingFragment extends DashboardFragment
|
||||
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);
|
||||
|
Reference in New Issue
Block a user