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 am: 95326e7f31

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

Change-Id: Icc817959eeb559d89c3f8b0bc7d14481de919b36
This commit is contained in:
Joshua Duong
2020-06-11 18:41:48 +00:00
committed by Automerger Merge Worker
parent e2e4f5a45d 95326e7f31
commit dec3d00370
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)) {
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(