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

Commit c33dc81c authored Mar 05, 2022 by Shashwat Razdan Committed by Automerger Merge Worker Mar 05, 2022

Merge changes from topic...

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

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

Change-Id: I3712e3cfb4a4c3b433f462d4545e4768e0f7e8ed

parents 49577525 9e1538b8

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