From 27d4606b57ab5b8f3d83c2f420ee641650122204 Mon Sep 17 00:00:00 2001
From: Juan Marcelo Tondato <jmt@xamarin.com>
Date: Tue, 26 Oct 2021 17:13:24 -0300
Subject: [PATCH] Adds api to get the list of supported jdk infos

- VisualStudio needs to know this list to set the default jdk on the android settings property page
---
 src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs | 2 +-
 src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs        | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs b/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs
index b7b594db..0b9cf605 100644
--- a/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs
+++ b/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs
@@ -185,7 +185,7 @@ public static void DetectAndSetPreferredJavaSdkPathToLatest (Action<TraceLevel,
 
 			logger          = logger ?? DefaultConsoleLogger;
 
-			var latestJdk   = JdkInfo.GetPreferredJdkInfos (logger).FirstOrDefault ();
+			var latestJdk   = JdkInfo.GetSupportedJdkInfos (logger).FirstOrDefault ();
 			if (latestJdk == null)
 				throw new NotSupportedException ("No Microsoft OpenJDK could be found.  Please re-run the Visual Studio installer or manually specify the JDK path in settings.");
 
diff --git a/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs b/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs
index 19c32535..433e2ff2 100644
--- a/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs
+++ b/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Diagnostics;
@@ -280,7 +280,7 @@ static Dictionary<string, List<string>> GetJavaProperties (string java)
 			return props;
 		}
 
-		// Keep ordering in sync w/ GetPreferredJdkInfos
+		// Keep ordering in sync w/ GetSupportedJdkInfos
 		public static IEnumerable<JdkInfo> GetKnownSystemJdkInfos (Action<TraceLevel, string>? logger = null)
 		{
 			logger  = logger ?? AndroidSdkInfo.DefaultConsoleLogger;
@@ -302,8 +302,10 @@ public static IEnumerable<JdkInfo> GetKnownSystemJdkInfos (Action<TraceLevel, st
 		}
 
 		// Keep ordering in sync w/ GetKnownSystemJdkInfos
-		internal static IEnumerable<JdkInfo> GetPreferredJdkInfos (Action<TraceLevel, string> logger)
+		public static IEnumerable<JdkInfo> GetSupportedJdkInfos (Action<TraceLevel, string>? logger = null)
 		{
+			logger = logger ?? AndroidSdkInfo.DefaultConsoleLogger;
+
 			return MicrosoftOpenJdkLocations.GetMicrosoftOpenJdks (logger)
 				.Concat (EclipseAdoptiumJdkLocations.GetEclipseAdoptiumJdks (logger))
 				.Concat (MicrosoftDistJdkLocations.GetMicrosoftDistJdks (logger))