Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bug fix for safe connect server #127

Merged
merged 2 commits into from
May 27, 2024
Merged

bug fix for safe connect server #127

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d8a072
bug fix for safe connect server, when _adb._safe_connect:66 raising A…
May 23, 2024
74f8ccd
add error assertion
May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions adbutils/_adb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,13 @@ def _create_socket(self):
def _safe_connect(self):
try:
return self._create_socket()
except AdbTimeout:
pass
except AdbConnectionError:
flags = subprocess.CREATE_NO_WINDOW if os.name == 'nt' else 0
subprocess.run([adb_path(), "start-server"], timeout=20.0, creationflags=flags) # 20s should enough for adb start
return self._create_socket()
pass
flags = subprocess.CREATE_NO_WINDOW if os.name == 'nt' else 0
subprocess.run([adb_path(), "start-server"], timeout=20.0, creationflags=flags) # 20s should enough for adb start
return self._create_socket()

@property
def closed(self) -> bool:
Expand Down
Loading