Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add PackageManagerInternal mock to prevent NPE"

Browse Source
This commit is contained in:
Tadashi G. Takaoka
2020-10-29 02:59:04 +00:00
committed by Android (Google) Code Review
parent eacac95375 a852bcb15f
commit 577e7a1cd9
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
services/tests/servicestests/src/com/android/server/am/AppErrorDialogTest.java
View File

@@ -18,17 +18,25 @@ package com.android.server.am;
import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManagerInternal;
import android.os.Handler;
import androidx.test.annotation.UiThreadTest;
import androidx.test.filters.FlakyTest;
import androidx.test.filters.SmallTest;
import com.android.server.LocalServices;
import com.android.server.appop.AppOpsService;
import com.android.server.wm.ActivityTaskManagerService;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
@@ -42,6 +50,18 @@ import java.io.File;
@FlakyTest(bugId = 113616538)
public class AppErrorDialogTest {
@BeforeClass
public static void setUpOnce() {
final PackageManagerInternal pm = mock(PackageManagerInternal.class);
doReturn(new ComponentName("", "")).when(pm).getSystemUiServiceComponent();
LocalServices.addService(PackageManagerInternal.class, pm);
}
@AfterClass
public static void tearDownOnce() {
LocalServices.removeServiceForTest(PackageManagerInternal.class);
}
@Rule
public ServiceThreadRule mServiceThreadRule = new ServiceThreadRule();