fix appvoice move to background fail

open-vela · Feb 25, 2025 · 7c95c2b · 7c95c2b
1 parent b74b663
commit 7c95c2b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/server/ActivityManagerService.cpp b/server/ActivityManagerService.cpp
@@ -330,6 +330,9 @@ int ActivityManagerInner::startActivityReal(ITaskManager* taskmanager, const str
                 std::make_shared<ActivityRecord>(activityUniqueName, caller, requestCode,
                                                  launchMode, targetTask, intent, mWindowManager,
                                                  taskmanager, &mPendTask);
+        if (intent.mAction == Intent::ACTION_BOOT_GUIDE) {
+            newActivity->setCallback([this]() { startHomeActivity(); });
+        }
         bool is_home_task =
                 std::any_of(packageInfo.activitiesInfo.begin(), packageInfo.activitiesInfo.end(),
                             [](const auto& activity) {

diff --git a/server/TaskStackManager.cpp b/server/TaskStackManager.cpp
@@ -66,26 +66,17 @@ bool TaskStackManager::moveTaskToBackground(const ActivityStackHandler& targetSt
     }
 
     // If it's above HomeTask, move it below HomeTask, otherwise no need to move it
-    for (auto iter = mAllTasks.begin(); iter != mAllTasks.end();) {
-        if (*iter == targetStack) {
-            isBeforeHomeTask = true;
-            auto tmp = iter;
-            ++iter;
-            mAllTasks.erase(tmp);
-        } else {
-            if (mHomeTask == nullptr) {
-                if (isBeforeHomeTask) {
-                    mAllTasks.push_back(targetStack);
-                    break;
-                }
-            }
-            if (*iter == mHomeTask) {
-                if (isBeforeHomeTask) {
-                    mAllTasks.insert(++iter, targetStack);
-                }
+    auto hometask_index = std::find(mAllTasks.begin(), mAllTasks.end(), mHomeTask);
+    if (hometask_index == mAllTasks.end()) {
+        mAllTasks.remove(targetStack);
+        mAllTasks.push_back(targetStack);
+    } else {
+        for (auto iter = mAllTasks.begin(); iter != hometask_index; ++iter) {
+            if (*iter == targetStack) {
+                mAllTasks.erase(iter);
+                mAllTasks.insert(++hometask_index, targetStack);
                 break;
             }
-            ++iter;
         }
     }