Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30fa7280 authored by wilsonshih's avatar wilsonshih
Browse files

Fix other tests be affected by mocked local services. 

Remove mocked local services after test finish, so it won't affect
other tests.

Fixes: 156221489
Test: atest ActivityStartInterceptorTest AppWindowTokenTests
Change-Id: I2e868204fe098c616ff8b2b17c3d47e42d799124
parent 47059f76

services/tests/wmtests/src/com/android/server/wm/ActivityStartInterceptorTest.java

+7 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.android.server.LocalServices; 
import com.android.server.am.ActivityManagerService;

import com.android.server.pm.PackageManagerService;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;
@@ -161,6 +162,12 @@ public class ActivityStartInterceptorTest { 
        mAInfo.packageName = mAInfo.applicationInfo.packageName = TEST_PACKAGE_NAME;

    }



    @After

    public void tearDown() {

        LocalServices.removeServiceForTest(ActivityManagerInternal.class);

        LocalServices.removeServiceForTest(DevicePolicyManagerInternal.class);

    }



    @Test

    public void testSuspendedByAdminPackage() {

        // GIVEN the package we're about to launch is currently suspended