c04cb487a42306ae7cb6c608a227305b30f82dcf - platform_frameworks_base

commit	c04cb487a42306ae7cb6c608a227305b30f82dcf	[log] [tgz]
author	Shashwat Razdan <srazdan@google.com>	Thu Mar 03 19:28:21 2022 +0000
committer	Shashwat Razdan <srazdan@google.com>	Thu Mar 03 14:27:30 2022 -0800
tree	5725abe2aa24569cd938af41543279a07deb1b6b
parent	3e2a850fa69cb3d9b7c36e7c5bee177825c20f6c [diff]

Revert "Revert "Adding multiple provider support in AbstractMast..."

Revert "Revert "Adding tests for multiple provider support in Ab..."

Revert submission 17060491-revert-17008428-cherrypick-multi-provider-cloudsearch-2yrjp5zxz1-WHCUFOAJWF

Reason for revert: Fixing the breakage in ag/17065868
Reverted Changes:
Ic57ef1339:Revert "Adding multiple provider support in Abstra...
I22cfed884:Revert "Adding tests for multiple provider support...

Test: atest CloudSearchServiceTestCases
Change-Id: I531fd57e5eab6c5106037558c0b6b8e81c629ec0

core/res/res/values/config.xml[diff]
core/res/res/values/symbols.xml[diff]
services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchManagerService.java[diff]
services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchManagerServiceShellCommand.java[diff]
services/cloudsearch/java/com/android/server/cloudsearch/CloudSearchPerUserService.java[diff]
services/core/java/com/android/server/infra/AbstractMasterSystemService.java[diff]
services/core/java/com/android/server/infra/AbstractPerUserSystemService.java[diff]
services/core/java/com/android/server/infra/FrameworkResourcesServiceNameResolver.java[diff]
services/core/java/com/android/server/infra/ServiceNameResolver.java[diff]

9 files changed