diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-08-10 03:19:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-10 03:19:55 +0000 |
| commit | 4d00d08afa67fa9f068b1b5bbaf2351c928cc7fc (patch) | |
| tree | 976d1a311f64c11b14480c4f0ff42be439c16a07 | |
| parent | e2cecc12ce4e46247b2840689cb64e37e315a76a (diff) | |
| parent | 1079d2160d3f44fb78aefc7e8c72ca18c85fae97 (diff) | |
| download | packages_apps_Settings-4d00d08afa67fa9f068b1b5bbaf2351c928cc7fc.tar.gz packages_apps_Settings-4d00d08afa67fa9f068b1b5bbaf2351c928cc7fc.tar.bz2 packages_apps_Settings-4d00d08afa67fa9f068b1b5bbaf2351c928cc7fc.zip | |
Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am: fdea2eaffa am: 1079d2160d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780668
Change-Id: I2c4e3487ce8295d6058a096a446c0014080407c2
| -rw-r--r-- | src/com/android/settings/development/WirelessDebuggingFragment.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/settings/development/WirelessDebuggingFragment.java b/src/com/android/settings/development/WirelessDebuggingFragment.java index 46fca98527..fecdbfa986 100644 --- a/src/com/android/settings/development/WirelessDebuggingFragment.java +++ b/src/com/android/settings/development/WirelessDebuggingFragment.java @@ -24,6 +24,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; @@ -314,8 +315,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); |