From bc114d2ff943350d179ff679c770bc9625d70650 Mon Sep 17 00:00:00 2001
From: Spandan Das <spandandas@google.com>
Date: Wed, 20 Dec 2023 01:27:29 +0000
Subject: [PATCH] Remove usage of OtherModuleHasProvider in dexpreopt_bootjars

Since OtherModuleHasProvider will be deprecated soon, replace it with OtherModuleProvider

Test: go build ./java
Change-Id: I79736e44d85bc6e8c97f08ebf783b40533a3e6ae
---
 java/dexpreopt_bootjars.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index e158ed362..8540ddbcb 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -552,8 +552,8 @@ func DexpreoptBootJarsMutator(ctx android.BottomUpMutatorContext) {
 func addDependenciesOntoSelectedBootImageApexes(ctx android.BottomUpMutatorContext, apexes ...string) {
 	psi := android.PrebuiltSelectionInfoMap{}
 	ctx.VisitDirectDepsWithTag(apexContributionsMetadataDepTag, func(am android.Module) {
-		if ctx.OtherModuleHasProvider(am, android.PrebuiltSelectionInfoProvider) {
-			psi = ctx.OtherModuleProvider(am, android.PrebuiltSelectionInfoProvider).(android.PrebuiltSelectionInfoMap)
+		if info, exists := android.OtherModuleProvider(ctx, am, android.PrebuiltSelectionInfoProvider); exists {
+			psi = info
 		}
 	})
 	for _, apex := range apexes {