Merge "Disable model loading with Sandbox check instead of static boolean." into main

This commit is contained in:
Brian Isganitis
2024-12-19 15:32:56 -08:00
committed by Android (Google) Code Review
2 changed files with 3 additions and 13 deletions

View File

@@ -29,7 +29,6 @@ import com.android.launcher3.taskbar.TaskbarActivityContext
import com.android.launcher3.taskbar.TaskbarControllers
import com.android.launcher3.taskbar.TaskbarManager
import com.android.launcher3.taskbar.TaskbarNavButtonController.TaskbarNavButtonCallbacks
import com.android.launcher3.taskbar.TaskbarViewController
import com.android.launcher3.taskbar.bubbles.BubbleControllers
import com.android.launcher3.taskbar.rules.TaskbarUnitTestRule.InjectController
import com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR
@@ -130,15 +129,12 @@ class TaskbarUnitTestRule(
}
try {
TaskbarViewController.enableModelLoadingForTests(false)
// Required to complete initialization.
instrumentation.runOnMainSync { taskbarManager.onUserUnlocked() }
base.evaluate()
} finally {
instrumentation.runOnMainSync { taskbarManager.destroy() }
TaskbarViewController.enableModelLoadingForTests(true)
}
}
}