Merge "Delete useless MSG_TLS_SERVER_PORT" into main (dedeb1e8) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/adb/AdbDebuggingManager.java

+4 −16

Original line number	Diff line number	Diff line
		@@ -322,15 +322,6 @@ public class AdbDebuggingManager {
		}
		}

		private void onServerPortReceived(int port) {
		Slog.d(TAG, "Received tls port=" + port);
		Message msg = mHandler.obtainMessage(port > 0
		? AdbDebuggingHandler.MSG_SERVER_CONNECTED
		: AdbDebuggingHandler.MSG_SERVER_DISCONNECTED);
		msg.obj = port;
		mHandler.sendMessage(msg);
		}

		@VisibleForTesting
		static class AdbDebuggingThread extends Thread {
		private boolean mStopped;
		@@ -503,8 +494,10 @@ public class AdbDebuggingManager {
		bytes.order(ByteOrder.LITTLE_ENDIAN);

		int port = bytes.getShort() & 0xFFFF;
		Message msg = mHandler.obtainMessage(
		AdbDebuggingHandler.MSG_TLS_SERVER_PORT);
		Slog.d(TAG, "Received tls port=" + port);
		Message msg = mHandler.obtainMessage(port > 0
		? AdbDebuggingHandler.MSG_SERVER_CONNECTED
		: AdbDebuggingHandler.MSG_SERVER_DISCONNECTED);
		msg.obj = port;
		mHandler.sendMessage(msg);
		} else {
		@@ -777,8 +770,6 @@ public class AdbDebuggingManager {
		// === Messages from other parts of the system
		private static final int MESSAGE_KEY_FILES_UPDATED = 28;

		private static final int MSG_TLS_SERVER_PORT = 29;

		// === Messages we can send to adbd ===========
		static final String MSG_DISCONNECT_DEVICE = "DD";

		@@ -1231,9 +1222,6 @@ public class AdbDebuggingManager {
		mAdbKeyStore.reloadKeyMap();
		break;
		}
		case MSG_TLS_SERVER_PORT: {
		onServerPortReceived((int) msg.obj);
		}
		}
		}