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

Commit 24b71afb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Inject more dependencies in PackageManagerService"

parents a6065e99 14fe6761

services/core/java/com/android/server/pm/PackageManagerService.java

+219 −172

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/PackageManagerComponentOverrideTests/src/com/android/server/pm/test/override/PackageManagerComponentLabelIconOverrideTest.kt

+3 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import org.junit.Before 
import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runners.Parameterized

import org.mockito.Mockito

import org.mockito.Mockito.any

import org.mockito.Mockito.anyBoolean

import org.mockito.Mockito.anyInt
@@ -341,7 +342,8 @@ class PackageManagerComponentLabelIconOverrideTest { 
            whenever(this.userManagerService) { mockUserManagerService }

            whenever(this.permissionManagerServiceInternal) { mockPermissionManagerService }

            whenever(this.settings) { mockSettings }

            whenever(this.activityTaskManagerInternal) { mockActivityTaskManager }

            whenever(this.getLocalService(ActivityTaskManagerInternal::class.java)) {

                mockActivityTaskManager}

            whenever(this.appsFilter) { mockAppsFilter }

            whenever(this.context) { mockContext }

        }