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

Merge "[adbwifi] Handle tls port changes." into rvc-dev am: 63facb88bd am: b84cafa24c am: 4e3d96116f

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

Change-Id: Ia9fd81d14025536c5a53a9c68112f55c866953b5
This commit is contained in:
Joshua Duong
2020-06-11 18:10:29 +00:00
committed by Automerger Merge Worker
parent 4a0a7b5e45 4e3d96116f
commit 95326e7f31
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,11 +113,9 @@ public class WirelessDebuggingFragment extends DashboardFragment
} else if (AdbManager.WIRELESS_DEBUG_STATE_CHANGED_ACTION.equals(action)) { } else if (AdbManager.WIRELESS_DEBUG_STATE_CHANGED_ACTION.equals(action)) {
int status = intent.getIntExtra(AdbManager.WIRELESS_STATUS_EXTRA, int status = intent.getIntExtra(AdbManager.WIRELESS_STATUS_EXTRA,
AdbManager.WIRELESS_STATUS_DISCONNECTED); AdbManager.WIRELESS_STATUS_DISCONNECTED);
if (status == AdbManager.WIRELESS_STATUS_CONNECTED) { if (status == AdbManager.WIRELESS_STATUS_CONNECTED
int port = intent.getIntExtra(AdbManager.WIRELESS_DEBUG_PORT_EXTRA, 0); || status == AdbManager.WIRELESS_STATUS_DISCONNECTED) {
Log.i(TAG, "Got adbwifi port=" + port); sAdbIpAddressPreferenceController.updateState(mIpAddrPreference);
} else {
Log.i(TAG, "adbwifi server disconnected");
} }
} else if (AdbManager.WIRELESS_DEBUG_PAIRING_RESULT_ACTION.equals(action)) { } else if (AdbManager.WIRELESS_DEBUG_PAIRING_RESULT_ACTION.equals(action)) {
Integer res = intent.getIntExtra( Integer res = intent.getIntExtra(