tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

EmbeddedPkg/AndroidFastbootApp: only use ENTER or SPACE to exit 

Since hotkey 'f' is used to start AndroidFastbootApp. If user
press 'f' key too long, it may be recognized pressing 'f' key
multiple times. Then AndroidFastbootApp exists since it delcares
any key press could make it exit.

So only use ENTER or SPACE key to exit AndroidFastbootApp.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
This commit is contained in:
Haojian Zhuang 2018-08-23 14:14:33 +08:00 committed by Ard Biesheuvel
parent 16973234fc
commit 6861765935
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.c
View File

@ -426,6 +426,7 @@ FastbootAppEntryPoint (
EFI_EVENT WaitEventArray[2]; EFI_EVENT WaitEventArray[2];
UINTN EventIndex; UINTN EventIndex;
EFI_SIMPLE_TEXT_INPUT_PROTOCOL *TextIn; EFI_SIMPLE_TEXT_INPUT_PROTOCOL *TextIn;
EFI_INPUT_KEY Key;
mDataBuffer = NULL; mDataBuffer = NULL;
@ -508,12 +509,21 @@ FastbootAppEntryPoint (
// Talk to the user // Talk to the user
mTextOut->OutputString (mTextOut, mTextOut->OutputString (mTextOut,
L"Android Fastboot mode - version " ANDROID_FASTBOOT_VERSION ". Press any key to quit.\r\n"); L"Android Fastboot mode - version " ANDROID_FASTBOOT_VERSION ". Press RETURN or SPACE key to quit.\r\n");
// Quit when the user presses any key, or mFinishedEvent is signalled // Quit when the user presses any key, or mFinishedEvent is signalled
WaitEventArray[0] = mFinishedEvent; WaitEventArray[0] = mFinishedEvent;
WaitEventArray[1] = TextIn->WaitForKey; WaitEventArray[1] = TextIn->WaitForKey;
while (1) {
gBS->WaitForEvent (2, WaitEventArray, &EventIndex); gBS->WaitForEvent (2, WaitEventArray, &EventIndex);
Status = TextIn->ReadKeyStroke (gST->ConIn, &Key);
if (Key.ScanCode == SCAN_NULL) {
if ((Key.UnicodeChar == CHAR_CARRIAGE_RETURN) ||
(Key.UnicodeChar == L' ')) {
break;
}
}
}
mTransport->Stop (); mTransport->Stop ();
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {