Merge "Fix build issues w/ jetpck drop" into main (df19a793) · Commits · e / os / android_frameworks_base

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

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -127,10 +127,10 @@ private fun getCredentialOptionInfoList(
	userName = credentialEntry.username.toString(),		userName = credentialEntry.username.toString(),
	displayName = credentialEntry.displayName?.toString(),		displayName = credentialEntry.displayName?.toString(),
	icon = credentialEntry.icon.loadDrawable(context),		icon = credentialEntry.icon.loadDrawable(context),
	shouldTintIcon = credentialEntry.isDefaultIcon,		shouldTintIcon = credentialEntry.hasDefaultIcon,
	lastUsedTimeMillis = credentialEntry.lastUsedTime,		lastUsedTimeMillis = credentialEntry.lastUsedTime,
	isAutoSelectable = credentialEntry.isAutoSelectAllowed &&		isAutoSelectable = credentialEntry.isAutoSelectAllowed &&
	credentialEntry.autoSelectAllowedFromOption,		credentialEntry.isAutoSelectAllowedFromOption,
	)		)
	)		)
	}		}
	@@ -148,10 +148,10 @@ private fun getCredentialOptionInfoList(
	userName = credentialEntry.username.toString(),		userName = credentialEntry.username.toString(),
	displayName = credentialEntry.displayName?.toString(),		displayName = credentialEntry.displayName?.toString(),
	icon = credentialEntry.icon.loadDrawable(context),		icon = credentialEntry.icon.loadDrawable(context),
	shouldTintIcon = credentialEntry.isDefaultIcon,		shouldTintIcon = credentialEntry.hasDefaultIcon,
	lastUsedTimeMillis = credentialEntry.lastUsedTime,		lastUsedTimeMillis = credentialEntry.lastUsedTime,
	isAutoSelectable = credentialEntry.isAutoSelectAllowed &&		isAutoSelectable = credentialEntry.isAutoSelectAllowed &&
	credentialEntry.autoSelectAllowedFromOption,		credentialEntry.isAutoSelectAllowedFromOption,
	)		)
	)		)
	}		}
	@@ -170,10 +170,10 @@ private fun getCredentialOptionInfoList(
	userName = credentialEntry.title.toString(),		userName = credentialEntry.title.toString(),
	displayName = credentialEntry.subtitle?.toString(),		displayName = credentialEntry.subtitle?.toString(),
	icon = credentialEntry.icon.loadDrawable(context),		icon = credentialEntry.icon.loadDrawable(context),
	shouldTintIcon = credentialEntry.isDefaultIcon,		shouldTintIcon = credentialEntry.hasDefaultIcon,
	lastUsedTimeMillis = credentialEntry.lastUsedTime,		lastUsedTimeMillis = credentialEntry.lastUsedTime,
	isAutoSelectable = credentialEntry.isAutoSelectAllowed &&		isAutoSelectable = credentialEntry.isAutoSelectAllowed &&
	credentialEntry.autoSelectAllowedFromOption,		credentialEntry.isAutoSelectAllowedFromOption,
	)		)
	)		)
	}		}