Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76df9386 authored by Roman Kiryanov's avatar Roman Kiryanov Committed by Android (Google) Code Review
Browse files

Merge "adb: skip listenToSocket if openSocketLocked fails" into main

parents 66a90914 e2a8ac2c

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

+8 −11
Original line number Diff line number Diff line
@@ -344,19 +344,16 @@ public class AdbDebuggingManager { 
        public void run() {

            Slog.d(TAG, "Entering thread");

            while (true) {

                try {

                    synchronized (this) {

                        if (mStopped) {

                            Slog.d(TAG, "Exiting thread");

                            return;

                        }

                    try {



                        openSocketLocked();

                    } catch (Exception e) {

                        /* Don't loop too fast if adbd dies, before init restarts it */

                        SystemClock.sleep(1000);

                    }

                    }

                try {



                    listenToSocket();

                } catch (Exception e) {

                    /* Don't loop too fast if adbd dies, before init restarts it */