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

Commit b84cafa2 authored by Joshua Duong's avatar Joshua Duong Committed by Automerger Merge Worker
Browse files

Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88 

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

Change-Id: Ib5e569614e15f5c39590fc40a18b2673e45f9767
parents a4b29edb 63facb88

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

+3 −5
Original line number Diff line number Diff line
@@ -113,11 +113,9 @@ public class WirelessDebuggingFragment extends DashboardFragment 
            } else if (AdbManager.WIRELESS_DEBUG_STATE_CHANGED_ACTION.equals(action)) {

                int status = intent.getIntExtra(AdbManager.WIRELESS_STATUS_EXTRA,

                        AdbManager.WIRELESS_STATUS_DISCONNECTED);

                if (status == AdbManager.WIRELESS_STATUS_CONNECTED) {

                    int port = intent.getIntExtra(AdbManager.WIRELESS_DEBUG_PORT_EXTRA, 0);

                    Log.i(TAG, "Got adbwifi port=" + port);

                } else {

                    Log.i(TAG, "adbwifi server disconnected");

                if (status == AdbManager.WIRELESS_STATUS_CONNECTED

                        || status == AdbManager.WIRELESS_STATUS_DISCONNECTED) {

                    sAdbIpAddressPreferenceController.updateState(mIpAddrPreference);

                }

            } else if (AdbManager.WIRELESS_DEBUG_PAIRING_RESULT_ACTION.equals(action)) {

                Integer res = intent.getIntExtra(