Skip to content

fix: prevent stderr from corrupting IME identifier in keyboard detection #396

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

Open
Ricardo-M-L wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevent stderr from corrupting IME identifier in keyboard detection #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion phone_agent/adb/input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def detect_and_set_adb_keyboard(device_id: str | None = None) -> str:
capture_output=True,
text=True,
)
current_ime = (result.stdout + result.stderr).strip()
current_ime = result.stdout.strip() if result.returncode == 0 else ""

# Switch to ADB Keyboard if not already set
if "com.android.adbkeyboard/.AdbIME" not in current_ime:
Expand Down
2 changes: 1 addition & 1 deletion phone_agent/hdc/input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def detect_and_set_adb_keyboard(device_id: str | None = None) -> str:
capture_output=True,
text=True,
)
current_ime = (result.stdout + result.stderr).strip()
current_ime = result.stdout.strip() if result.returncode == 0 else ""

# If ADB Keyboard equivalent exists for HarmonyOS, switch to it
# For now, we'll just return the current IME
Expand Down