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

Commit 35f3bf3f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix AdbService/AdbDebuggingManager race conditon" into main

parents 68b3fd1b 1220a22c

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

+0 −4
Original line number Diff line number Diff line
@@ -1204,8 +1204,6 @@ public class AdbDebuggingManager { 
                    synchronized (mAdbConnectionInfo) {

                        mAdbConnectionInfo.setPort(port);

                    }

                    Settings.Global.putInt(mContentResolver,

                            Settings.Global.ADB_WIFI_ENABLED, 1);

                    break;

                }

                case MSG_SERVER_DISCONNECTED: {
@@ -1214,8 +1212,6 @@ public class AdbDebuggingManager { 
                    }

                    int port = (int) msg.obj;

                    onAdbdWifiServerDisconnected(port);

                    Settings.Global.putInt(mContentResolver,

                            Settings.Global.ADB_WIFI_ENABLED, 0);

                    stopAdbDebuggingThread();

                    break;

                }