Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reread the tls port on adbd restarts." into rvc-dev

Browse Source
This commit is contained in:
Joshua Duong
2020-06-11 17:23:00 +00:00
committed by Android (Google) Code Review
parent 8808b5a3d3 8ee00491ac
commit 9e7a8c853c
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
services/core/java/com/android/server/adb/AdbDebuggingManager.java
View File

@@ -337,6 +337,7 @@ public class AdbDebuggingManager {
class PortListenerImpl implements AdbConnectionPortListener { class PortListenerImpl implements AdbConnectionPortListener {
public void onPortReceived(int port) { public void onPortReceived(int port) {
if (DEBUG) Slog.d(TAG, "Received tls port=" + port);
Message msg = mHandler.obtainMessage(port > 0 Message msg = mHandler.obtainMessage(port > 0
? AdbDebuggingHandler.MSG_SERVER_CONNECTED ? AdbDebuggingHandler.MSG_SERVER_CONNECTED
: AdbDebuggingHandler.MSG_SERVER_DISCONNECTED); : AdbDebuggingHandler.MSG_SERVER_DISCONNECTED);
@@ -392,6 +393,7 @@ public class AdbDebuggingManager {
mOutputStream = mSocket.getOutputStream(); mOutputStream = mSocket.getOutputStream();
mInputStream = mSocket.getInputStream(); mInputStream = mSocket.getInputStream();
mHandler.sendEmptyMessage(AdbDebuggingHandler.MSG_ADBD_SOCKET_CONNECTED);
} catch (IOException ioe) { } catch (IOException ioe) {
Slog.e(TAG, "Caught an exception opening the socket: " + ioe); Slog.e(TAG, "Caught an exception opening the socket: " + ioe);
closeSocketLocked(); closeSocketLocked();
@@ -504,6 +506,7 @@ public class AdbDebuggingManager {
} catch (IOException ex) { } catch (IOException ex) {
Slog.e(TAG, "Failed closing socket: " + ex); Slog.e(TAG, "Failed closing socket: " + ex);
} }
mHandler.sendEmptyMessage(AdbDebuggingHandler.MSG_ADBD_SOCKET_DISCONNECTED);
} }
/** Call to stop listening on the socket and exit the thread. */ /** Call to stop listening on the socket and exit the thread. */
@@ -729,6 +732,10 @@ public class AdbDebuggingManager {
static final int MSG_SERVER_CONNECTED = 24; static final int MSG_SERVER_CONNECTED = 24;
// Notifies us the TLS server is disconnected // Notifies us the TLS server is disconnected
static final int MSG_SERVER_DISCONNECTED = 25; static final int MSG_SERVER_DISCONNECTED = 25;
// Notification when adbd socket successfully connects.
static final int MSG_ADBD_SOCKET_CONNECTED = 26;
// Notification when adbd socket is disconnected.
static final int MSG_ADBD_SOCKET_DISCONNECTED = 27;
// === Messages we can send to adbd =========== // === Messages we can send to adbd ===========
static final String MSG_DISCONNECT_DEVICE = "DD"; static final String MSG_DISCONNECT_DEVICE = "DD";
@@ -1170,6 +1177,28 @@ public class AdbDebuggingManager {
} }
break; break;
} }
case MSG_ADBD_SOCKET_CONNECTED: {
if (DEBUG) Slog.d(TAG, "adbd socket connected");
if (mAdbWifiEnabled) {
// In scenarios where adbd is restarted, the tls port may change.
mConnectionPortPoller =
new AdbDebuggingManager.AdbConnectionPortPoller(mPortListener);
mConnectionPortPoller.start();
}
break;
}
case MSG_ADBD_SOCKET_DISCONNECTED: {
if (DEBUG) Slog.d(TAG, "adbd socket disconnected");
if (mConnectionPortPoller != null) {
mConnectionPortPoller.cancelAndWait();
mConnectionPortPoller = null;
}
if (mAdbWifiEnabled) {
// In scenarios where adbd is restarted, the tls port may change.
onAdbdWifiServerDisconnected(-1);
}
break;
}
} }
} }