From 0b4698840e7b63366295eb58d060dc63f9e582b5 Mon Sep 17 00:00:00 2001
From: Qinmei Du <duqinmei@google.com>
Date: Fri, 4 Nov 2022 22:10:16 +0000
Subject: [PATCH] Make createOptionsInfo sorted by the lastUsedTimeMillis

screenshot: https://screenshot.googleplex.com/5M96kcjaoobYuyR (The
createInfo changed to work account as it's lastUsedTime is larger
Test: deployed locally

Bug: 253157211
Change-Id: Ic56b076831303e135c010e66a5497ae622685c22
---
 .../src/com/android/credentialmanager/CredentialManagerRepo.kt | 3 ++-
 .../com/android/credentialmanager/createflow/CreateModel.kt    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
index 9e9d16f13aa17..33bc79c0a4e8a 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt
@@ -123,7 +123,8 @@ class CredentialManagerRepo(
       providerList as List<CreateCredentialProviderData>, context)
     var hasDefault = false
     var defaultProvider: ProviderInfo = providerList.first()
-    providerList.forEach{providerInfo ->
+    providerList.forEach{providerInfo -> providerInfo.createOptions =
+      providerInfo.createOptions.sortedWith(compareBy { it.lastUsedTimeMillis }).reversed()
       if (providerInfo.isDefault) {hasDefault = true; defaultProvider = providerInfo} }
     // TODO: covert from real requestInfo
     val requestDisplayInfo = RequestDisplayInfo(
diff --git a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateModel.kt b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateModel.kt
index d7e5ee8c721e8..70bb867a5de41 100644
--- a/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateModel.kt
+++ b/packages/CredentialManager/src/com/android/credentialmanager/createflow/CreateModel.kt
@@ -22,7 +22,7 @@ data class ProviderInfo(
   val icon: Drawable,
   val name: String,
   val displayName: String,
-  val createOptions: List<CreateOptionInfo>,
+  var createOptions: List<CreateOptionInfo>,
   val isDefault: Boolean,
 )