Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe0c5515 authored by Anvesh Renikindi's avatar Anvesh Renikindi Committed by Automerger Merge Worker
Browse files

Merge "Fix build issues w/ jetpck drop" into main am: df19a793 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3004426



Change-Id: Icf0b145314c60d095d20f36e392563a834f557a7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0df8b87 df19a793

packages/CredentialManager/shared/src/com/android/credentialmanager/ktx/CredentialKtx.kt

+6 −6
Original line number Diff line number Diff line
@@ -127,10 +127,10 @@ private fun getCredentialOptionInfoList( 
                    userName = credentialEntry.username.toString(),

                    displayName = credentialEntry.displayName?.toString(),

                    icon = credentialEntry.icon.loadDrawable(context),

                    shouldTintIcon = credentialEntry.isDefaultIcon,

                    shouldTintIcon = credentialEntry.hasDefaultIcon,

                    lastUsedTimeMillis = credentialEntry.lastUsedTime,

                    isAutoSelectable = credentialEntry.isAutoSelectAllowed &&

                            credentialEntry.autoSelectAllowedFromOption,

                            credentialEntry.isAutoSelectAllowedFromOption,

                )

                )

            }
@@ -148,10 +148,10 @@ private fun getCredentialOptionInfoList( 
                    userName = credentialEntry.username.toString(),

                    displayName = credentialEntry.displayName?.toString(),

                    icon = credentialEntry.icon.loadDrawable(context),

                    shouldTintIcon = credentialEntry.isDefaultIcon,

                    shouldTintIcon = credentialEntry.hasDefaultIcon,

                    lastUsedTimeMillis = credentialEntry.lastUsedTime,

                    isAutoSelectable = credentialEntry.isAutoSelectAllowed &&

                            credentialEntry.autoSelectAllowedFromOption,

                            credentialEntry.isAutoSelectAllowedFromOption,

                )

                )

            }
@@ -170,10 +170,10 @@ private fun getCredentialOptionInfoList( 
                    userName = credentialEntry.title.toString(),

                    displayName = credentialEntry.subtitle?.toString(),

                    icon = credentialEntry.icon.loadDrawable(context),

                    shouldTintIcon = credentialEntry.isDefaultIcon,

                    shouldTintIcon = credentialEntry.hasDefaultIcon,

                    lastUsedTimeMillis = credentialEntry.lastUsedTime,

                    isAutoSelectable = credentialEntry.isAutoSelectAllowed &&

                            credentialEntry.autoSelectAllowedFromOption,

                            credentialEntry.isAutoSelectAllowedFromOption,

                )

                )

            }