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

Commit 8987f02f authored by Hai Zhang's avatar Hai Zhang Committed by Android (Google) Code Review
Browse files

Merge "Expose PackageManagerLocal earlier for system components to use."

parents de0764ef 8e8ccad6

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

+2 −2
Original line number Diff line number Diff line
@@ -1597,8 +1597,6 @@ public class PackageManagerService implements PackageSender, TestUtilityService 
        ServiceManager.addService("package", iPackageManager);

        final PackageManagerNative pmn = new PackageManagerNative(m);

        ServiceManager.addService("package_native", pmn);

        LocalManagerRegistry.addManager(PackageManagerLocal.class,

                new PackageManagerLocalImpl(m));

        return m;

    }
@@ -1797,6 +1795,8 @@ public class PackageManagerService implements PackageSender, TestUtilityService 


        // Expose private service for system components to use.

        LocalServices.addService(PackageManagerInternal.class, new PackageManagerInternalImpl());

        LocalManagerRegistry.addManager(PackageManagerLocal.class,

                new PackageManagerLocalImpl(this));

        LocalServices.addService(TestUtilityService.class, this);

        mTestUtilityService = LocalServices.getService(TestUtilityService.class);

        mUserManager = injector.getUserManagerService();

services/tests/mockingservicestests/src/com/android/server/pm/MockSystem.kt

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ import com.android.dx.mockito.inline.extended.ExtendedMockito.spy 
import com.android.dx.mockito.inline.extended.StaticMockitoSession

import com.android.dx.mockito.inline.extended.StaticMockitoSessionBuilder

import com.android.internal.R

import com.android.server.LocalManagerRegistry

import com.android.server.LocalServices

import com.android.server.LockGuard

import com.android.server.SystemConfig
@@ -148,6 +149,7 @@ class MockSystem(withSession: (StaticMockitoSessionBuilder) -> Unit = {}) { 
                .mockStatic(LockGuard::class.java)

                .mockStatic(EventLog::class.java)

                .mockStatic(LocalServices::class.java)

                .mockStatic(LocalManagerRegistry::class.java)

                .mockStatic(DeviceConfig::class.java)

                .mockStatic(HexEncoding::class.java)

                .apply(withSession)