PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am: fdea2eaffa am: 1079d2160d am: 4d00d08afa am: 57fba3fd53

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780668

Change-Id: I62e69b314022da7b731a0ce5ef3e8baccd7404a7
This commit is contained in:
Treehugger Robot
2021-08-10 03:50:20 +00:00
committed by Automerger Merge Worker
parent 24d5f409e5 57fba3fd53
commit deeda01639
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/development/WirelessDebuggingFragment.java
View File

@@ -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);