Merge "Turn on ADB WiFi When ADB Connects if it's Enabled" into main (dc989bed) · Commits · e / os / android_frameworks_base

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

+20 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.server.adb;
		import static android.os.InputConstants.DEFAULT_DISPATCHING_TIMEOUT_MILLIS;

		import static com.android.internal.util.dump.DumpUtils.writeStringIfNotNull;
		import static com.android.server.adb.AdbDebuggingManager.AdbDebuggingHandler.MSG_START_ADB_WIFI;
		import static com.android.server.adb.AdbService.ADBD;

		import android.annotation.NonNull;
		@@ -71,6 +72,7 @@ import com.android.internal.messages.nano.SystemMessageProto.SystemMessage;
		import com.android.internal.util.FrameworkStatsLog;
		import com.android.internal.util.dump.DualDumpOutputStream;
		import com.android.server.FgThread;
		import com.android.server.adb.AdbDebuggingManager.AdbDebuggingThread.OnConnectionCallback;

		import java.io.File;
		import java.io.IOException;
		@@ -218,6 +220,11 @@ public class AdbDebuggingManager {

		@VisibleForTesting
		static class AdbDebuggingThread extends Thread {
		interface OnConnectionCallback {
		void onConnected(AdbDebuggingThread thread);
		}

		private final OnConnectionCallback mOnConnectionCallback;
		private LocalSocket mSocket;
		private OutputStream mOutputStream;
		private InputStream mInputStream;
		@@ -226,8 +233,9 @@ public class AdbDebuggingManager {
		private boolean mConnected = false;

		@VisibleForTesting
		AdbDebuggingThread() {
		AdbDebuggingThread(OnConnectionCallback onConnectionCallback) {
		super(TAG);
		mOnConnectionCallback = onConnectionCallback;
		}

		@VisibleForTesting
		@@ -244,6 +252,7 @@ public class AdbDebuggingManager {
		mConnected = false;
		openSocketLocked();
		mConnected = true;
		mOnConnectionCallback.onConnected(this);
		}

		listenToSocket();
		@@ -593,7 +602,7 @@ public class AdbDebuggingManager {
		AdbDebuggingHandler(Looper looper, AdbDebuggingThread thread) {
		super(looper);
		if (thread == null) {
		thread = new AdbDebuggingThread();
		thread = new AdbDebuggingThread(new StartAdbWifiConnectionCallback());
		thread.setHandler(this);
		}
		mThread = thread;
		@@ -1581,4 +1590,13 @@ public class AdbDebuggingManager {
		interface Ticker {
		long currentTimeMillis();
		}

		private class StartAdbWifiConnectionCallback implements OnConnectionCallback {
		@Override
		public void onConnected(AdbDebuggingThread thread) {
		if (isAdbWifiEnabled() && wifiLifeCycleOverAdbdauthSupported()) {
		thread.sendResponse(MSG_START_ADB_WIFI);
		}
		}
		}
		}

services/tests/servicestests/src/com/android/server/adb/AdbDebuggingManagerTest.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1188,6 +1188,10 @@ public final class AdbDebuggingManagerTest {
		* indicating whether the key should be allowed to connect.
		*/
		private class AdbDebuggingThreadTest extends AdbDebuggingManager.AdbDebuggingThread {
		AdbDebuggingThreadTest() {
		super(thread -> {});
		}

		@Override
		public void sendResponse(String msg) {
		TestResult result = new TestResult(TestResult.RESULT_RESPONSE_RECEIVED, msg);