Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit deeda016 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am:... 

Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am: fdea2eaf am: 1079d216 am: 4d00d08a am: 57fba3fd

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

Change-Id: I62e69b314022da7b731a0ce5ef3e8baccd7404a7
parents 24d5f409 57fba3fd

src/com/android/settings/development/WirelessDebuggingFragment.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -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);