Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "revert-17060491-revert-17008428-cherrypick-multi-provider-cloudsearch-2yrjp5zxz1-WHCUFOAJWF-WKGCSSGIPI" into tm-dev am: 9e1538b8c7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17065868

Change-Id: I3712e3cfb4a4c3b433f462d4545e4768e0f7e8ed
This commit is contained in:
Shashwat Razdan
2022-03-05 04:14:18 +00:00
committed by Automerger Merge Worker
parent 495775251f 9e1538b8c7
commit c33dc81cc6
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/infra/AbstractMasterSystemService.java
View File

@@ -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 {

3
services/core/java/com/android/server/infra/AbstractPerUserSystemService.java
View File

@@ -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();