From 52cd7f6bde06e3a4d9441c77bb1914f5bacfbdce Mon Sep 17 00:00:00 2001
From: Shashwat Razdan <srazdan@google.com>
Date: Thu, 3 Mar 2022 00:54:12 -0800
Subject: [PATCH] Fixing multi provider support in AbstractMasterSystemService

Bug: 222221754
Test: atest CtsSpeechTestCases https://paste.googleplex.com/4705640246149120 [The test which was broken]
Change-Id: I6bf10c6176dfd12560cda896128a1e549cdaa1fb
---
 .../android/server/infra/AbstractMasterSystemService.java    | 5 +----
 .../android/server/infra/AbstractPerUserSystemService.java   | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
index 29e5f922b468a..34e3ce1ab641c 100644
--- a/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
+++ b/services/core/java/com/android/server/infra/AbstractMasterSystemService.java
@@ -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 {
diff --git a/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java b/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java
index 58413c9c57056..b8f1db402a555 100644
--- a/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java
+++ b/services/core/java/com/android/server/infra/AbstractPerUserSystemService.java
@@ -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();