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

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

Merge "Passes Injector into PackageManagerService ctor"

parents ff3f862c 6ae7afc1

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import java.io.File; 
import java.util.Set;



@VisibleForTesting

interface PackageAbiHelper {

public interface PackageAbiHelper {

    /**

     * Derive and get the location of native libraries for the given package,

     * which varies depending on where and how the package was installed.

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

+162 −74

File changed.

Preview size limit exceeded, changes collapsed.

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

+8 −0
Original line number Diff line number Diff line
@@ -576,6 +576,14 @@ public class UserManagerService extends IUserManager.Stub { 
                null, mHandler);

    }



    /**

     * This method retrieves the  {@link UserManagerInternal} only for the purpose of

     * PackageManagerService construction.

     */

    UserManagerInternal getInternalForInjectorOnly() {

        return mLocalService;

    }



    void cleanupPartialUsers() {

        // Prune out any partially created, partially removed and ephemeral users.

        ArrayList<UserInfo> partials = new ArrayList<>();

services/tests/servicestests/src/com/android/server/pm/ScanTests.java

+10 −2
Original line number Diff line number Diff line
@@ -70,6 +70,14 @@ public class ScanTests { 
    PackageAbiHelper mMockPackageAbiHelper;

    @Mock

    UserManagerInternal mMockUserManager;

    @Mock

    PackageManagerService.Injector mMockInjector;



    @Before

    public void setupInjector() {

        when(mMockInjector.getAbiHelper()).thenReturn(mMockPackageAbiHelper);

        when(mMockInjector.getUserManager()).thenReturn(mMockUserManager);

    }



    @Before

    public void setupDefaultUser() {
@@ -401,7 +409,7 @@ public class ScanTests { 


        final PackageManagerService.ScanResult scanResult = PackageManagerService.scanPackageOnlyLI(

                createBasicScanRequestBuilder(basicPackage).build(),

                new PackageManagerService.Injector(mMockUserManager, mMockPackageAbiHelper),

                mMockInjector,

                true /*isUnderFactoryTest*/,

                System.currentTimeMillis());
@@ -448,7 +456,7 @@ public class ScanTests { 
            PackageManagerService.ScanRequest scanRequest) throws PackageManagerException {

        return PackageManagerService.scanPackageOnlyLI(

                scanRequest,

                new PackageManagerService.Injector(mMockUserManager, mMockPackageAbiHelper),

                mMockInjector,

                false /*isUnderFactoryTest*/,

                System.currentTimeMillis());

    }