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

Commit 52cd7f6b authored by Shashwat Razdan's avatar Shashwat Razdan
Browse files

Fixing multi provider support in AbstractMasterSystemService 

Bug: 222221754
Test: atest CtsSpeechTestCases https://paste.googleplex.com/4705640246149120 [The test which was broken]
Change-Id: I6bf10c6176dfd12560cda896128a1e549cdaa1fb
parent c04cb487

services/core/java/com/android/server/infra/AbstractMasterSystemService.java

+1 −4
Original line number Diff line number Diff line
@@ -604,10 +604,7 @@ public abstract class AbstractMasterSystemService<M extends AbstractMasterSystem 
        List<S> services = mServicesCacheList.get(resolvedUserId);

        if (services == null || services.size() == 0) {

            final boolean disabled = isDisabledLocked(userId);

            if (mServiceNameResolver == null) {

                return null;

            }

            if (mServiceNameResolver.isConfiguredInMultipleMode()) {

            if (mServiceNameResolver != null && mServiceNameResolver.isConfiguredInMultipleMode()) {

                services = newServiceListLocked(resolvedUserId, disabled,

                        mServiceNameResolver.getServiceNameList(userId));

            } else {

services/core/java/com/android/server/infra/AbstractPerUserSystemService.java

+2 −1
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ public abstract class AbstractPerUserSystemService<S extends AbstractPerUserSyst 
        updateIsSetupComplete(mUserId);

        mDisabled = disabled;



        if (mMaster.mServiceNameResolver.isConfiguredInMultipleMode()) {

        if (mMaster.mServiceNameResolver != null

                && mMaster.mServiceNameResolver.isConfiguredInMultipleMode()) {

            updateServiceInfoListLocked();

        } else {

            updateServiceInfoLocked();