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

Commit 685031ab authored by Qinmei Du's avatar Qinmei Du Committed by Android (Google) Code Review
Browse files

Merge "Make disabledProviderList nullable"

parents 916368df a3d3414c

packages/CredentialManager/src/com/android/credentialmanager/CredentialManagerRepo.kt

+3 −3
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ class CredentialManagerRepo( 
) {

  val requestInfo: RequestInfo

  private val providerEnabledList: List<ProviderData>

  private val providerDisabledList: List<DisabledProviderData>

  private val providerDisabledList: List<DisabledProviderData>?

  // TODO: require non-null.

  val resultReceiver: ResultReceiver?
@@ -143,7 +143,7 @@ class CredentialManagerRepo( 
      providerEnabledList as List<CreateCredentialProviderData>, requestDisplayInfo, context)

    val providerDisabledList = CreateFlowUtils.toDisabledProviderList(

      // Handle runtime cast error

      providerDisabledList as List<DisabledProviderData>, context)

      providerDisabledList, context)

    var defaultProvider: EnabledProviderInfo? = null

    var remoteEntry: RemoteInfo? = null

    providerEnabledList.forEach{providerInfo -> providerInfo.createOptions =
@@ -209,7 +209,7 @@ class CredentialManagerRepo( 
    )

  }



  private fun testDisabledProviderList(): List<DisabledProviderData> {

  private fun testDisabledProviderList(): List<DisabledProviderData>? {

    return listOf(

      DisabledProviderData("com.lastpass.lpandroid"),

      DisabledProviderData("com.google.android.youtube")

packages/CredentialManager/src/com/android/credentialmanager/DataConverter.kt

+3 −3
Original line number Diff line number Diff line
@@ -209,12 +209,12 @@ class CreateFlowUtils { 
    }



    fun toDisabledProviderList(

      providerDataList: List<DisabledProviderData>,

      providerDataList: List<DisabledProviderData>?,

      context: Context,

    ): List<com.android.credentialmanager.createflow.DisabledProviderInfo> {

    ): List<com.android.credentialmanager.createflow.DisabledProviderInfo>? {

      // TODO: get from the actual service info

      val packageManager = context.packageManager

      return providerDataList.map {

      return providerDataList?.map {

        val pkgInfo = packageManager

          .getPackageInfo(it.providerFlattenedComponentName,

            PackageManager.PackageInfoFlags.of(0))