PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Consolidate WorkProfileTest "@After" methods am: e6d86e20aa

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22330314

Change-Id: Ifaf79cfc0f1ff5db81bfa6a8116c65de90377552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vinit Nayak
2023-03-30 19:58:55 +00:00
committed by Automerger Merge Worker
parent 7779baf4ab e6d86e20aa
commit f9c5299a67
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/com/android/launcher3/ui/WorkProfileTest.java
+3 -5
View File
@@ -36,6 +36,7 @@ import com.android.launcher3.allapps.WorkEduCard;
import com.android.launcher3.allapps.WorkPausedCard; import com.android.launcher3.allapps.WorkPausedCard;
import com.android.launcher3.allapps.WorkProfileManager; import com.android.launcher3.allapps.WorkProfileManager;
import com.android.launcher3.tapl.LauncherInstrumentation; import com.android.launcher3.tapl.LauncherInstrumentation;
import com.android.launcher3.testing.shared.TestProtocol;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
@@ -90,17 +91,14 @@ public class WorkProfileTest extends AbstractLauncherUiTest {
@After @After
public void removeWorkProfile() throws Exception { public void removeWorkProfile() throws Exception {
mDevice.executeShellCommand("pm remove-user " + mProfileUserId); Log.d(TestProtocol.WORK_TAB_MISSING, "WorkProfileTest teardown");
}
@After
public void resumeAppStoreUpdate() {
executeOnLauncher(launcher -> { executeOnLauncher(launcher -> {
if (launcher == null || launcher.getAppsView() == null) { if (launcher == null || launcher.getAppsView() == null) {
return; return;
} }
launcher.getAppsView().getAppsStore().disableDeferUpdates(DEFER_UPDATES_TEST); launcher.getAppsView().getAppsStore().disableDeferUpdates(DEFER_UPDATES_TEST);
}); });
mDevice.executeShellCommand("pm remove-user " + mProfileUserId);
} }
private void waitForWorkTabSetup() { private void waitForWorkTabSetup() {