Merge release/18.1.0 to dev (#2520)

Co-authored-by: melissaahn <[email protected]>

Author: mohitc1

changelog.txt

@@ -1,5 +1,6 @@
-vNext
+Version 18.1.0
 ----------
+(common4j 15.1.0)
 - [MINOR] Use legacy FIDO2 API to provide security key support to Android 13 devices (#2508)
 
 Version 18.0.0 

common/src/main/java/com/microsoft/identity/common/internal/fido/CredManFidoManager.kt

@@ -29,6 +29,8 @@ import androidx.credentials.GetCredentialRequest
 import androidx.credentials.GetPublicKeyCredentialOption
 import androidx.credentials.PublicKeyCredential
 import androidx.credentials.exceptions.NoCredentialException
+import com.microsoft.identity.common.java.flighting.CommonFlight
+import com.microsoft.identity.common.java.flighting.CommonFlightsManager.getFlightsProvider
 import com.microsoft.identity.common.java.opentelemetry.AttributeName
 import com.microsoft.identity.common.logging.Logger
 import io.opentelemetry.api.trace.Span
@@ -82,7 +84,7 @@ class CredManFidoManager (val context: Context,
             // We're setting preferImmediatelyAvailableCredentials in the CredMan getCredentialRequest object to true if the device OS is Android 13 or lower.
             // This ensures the behavior where no dialog from CredMan is shown if no passkey cred is present.
             // The end goal is for an Android <= 13 user who only has a security key to see one dialog which will allow them to authenticate.
-            preferImmediatelyAvailableCredentials = (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
+            preferImmediatelyAvailableCredentials = (getFlightsProvider().isFlightEnabled(CommonFlight.ENABLE_LEGACY_FIDO_SECURITY_KEY_LOGIC) && Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
         )
         try {
             Logger.info(methodTag, "Calling Credential Manager with a GetCredentialRequest.")

common4j/versioning/version.properties

@@ -1,4 +1,4 @@
 #Wed May 12 20:08:39 UTC 2021
-versionName=15.0.0
+versionName=15.1.0
 versionCode=1
 latestPatchVersion=227

versioning/version.properties

@@ -1,4 +1,4 @@
 #Tue Apr 06 22:55:08 UTC 2021
-versionName=18.0.0
+versionName=18.1.0
 versionCode=1
 latestPatchVersion=234