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 am: deeda01639

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

Change-Id: I3ae58ec64af90800c4393bd22993d5214070753f
This commit is contained in:
Treehugger Robot
2021-08-10 04:08:06 +00:00
committed by Automerger Merge Worker
parent b48b23775c deeda01639
commit 4cfaa7d957
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.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.debug.AdbManager; import android.debug.AdbManager;
import android.debug.FingerprintAndPairDevice;
import android.debug.IAdbManager; import android.debug.IAdbManager;
import android.debug.PairDevice; import android.debug.PairDevice;
import android.os.Build; import android.os.Build;
@@ -314,8 +315,12 @@ public class WirelessDebuggingFragment extends DashboardFragment
mAdbManager = IAdbManager.Stub.asInterface(ServiceManager.getService( mAdbManager = IAdbManager.Stub.asInterface(ServiceManager.getService(
Context.ADB_SERVICE)); Context.ADB_SERVICE));
try { try {
Map<String, PairDevice> newList = mAdbManager.getPairedDevices(); FingerprintAndPairDevice[] newList = mAdbManager.getPairedDevices();
updatePairedDevicePreferences(newList); Map<String, PairDevice> newMap = new HashMap<>();
for (FingerprintAndPairDevice pair : newList) {
newMap.put(pair.keyFingerprint, pair.device);
}
updatePairedDevicePreferences(newMap);
mConnectionPort = mAdbManager.getAdbWirelessPort(); mConnectionPort = mAdbManager.getAdbWirelessPort();
if (mConnectionPort > 0) { if (mConnectionPort > 0) {
Log.i(TAG, "onEnabled(): connect_port=" + mConnectionPort); Log.i(TAG, "onEnabled(): connect_port=" + mConnectionPort);