From 59575aaaccc37b837b7a5d3c93efeda0c41d31b6 Mon Sep 17 00:00:00 2001 From: Sai Skanda Date: Wed, 4 Feb 2026 14:40:37 +0530 Subject: [PATCH 1/2] fix: Android LlamaDemo app - remove unnecessary stop code check per model --- .../executorchllamademo/ui/viewmodel/ChatViewModel.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ChatViewModel.kt b/llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ChatViewModel.kt index 5d895fff..105d18f7 100644 --- a/llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ChatViewModel.kt +++ b/llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ChatViewModel.kt @@ -482,13 +482,9 @@ class ChatViewModel(application: Application) : AndroidViewModel(application), L var processedResult = result if (processedResult == PromptFormat.getStopToken(currentSettingsFields.modelType)) { - if (currentSettingsFields.modelType == ModelType.GEMMA_3 || - currentSettingsFields.modelType == ModelType.LLAVA_1_5 - ) { module?.stop() + return } - return - } processedResult = PromptFormat.replaceSpecialToken(currentSettingsFields.modelType, processedResult) From 71561ae4356637126e23519b4c6095dcceae3ed1 Mon Sep 17 00:00:00 2001 From: Hansong Zhang <107070759+kirklandsign@users.noreply.github.com> Date: Wed, 4 Feb 2026 10:36:45 -0800 Subject: [PATCH 2/2] Update llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ChatViewModel.kt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../executorchllamademo/ui/viewmodel/ChatViewModel.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ChatViewModel.kt b/llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ChatViewModel.kt index 105d18f7..f7bd4ad0 100644 --- a/llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ChatViewModel.kt +++ b/llm/android/LlamaDemo/app/src/main/java/com/example/executorchllamademo/ui/viewmodel/ChatViewModel.kt @@ -482,9 +482,9 @@ class ChatViewModel(application: Application) : AndroidViewModel(application), L var processedResult = result if (processedResult == PromptFormat.getStopToken(currentSettingsFields.modelType)) { - module?.stop() - return - } + module?.stop() + return + } processedResult = PromptFormat.replaceSpecialToken(currentSettingsFields.modelType, processedResult)