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

Commit f5991ee2 authored by Colin Cross's avatar Colin Cross Committed by Android (Google) Code Review
Browse files

Merge "Fix kotlin nullable errors in CompanionDeviceMultiDeviceTests" into main

parents eff11167 eb39ad8f

tests/CompanionDeviceMultiDeviceTests/client/src/android/companion/multidevices/CompanionDeviceManagerSnippet.kt

+4 −4
Original line number Diff line number Diff line
@@ -112,10 +112,10 @@ class CompanionDeviceManagerSnippet : Snippet { 
            throw CompanionException("Association result can't be null.")

        }



        val association = result.getParcelableExtra(

        val association = checkNotNull(result.getParcelableExtra(

            CompanionDeviceManager.EXTRA_ASSOCIATION,

            AssociationInfo::class.java

        )

        ))

        val remoteDevice = association.associatedDevice?.getBluetoothDevice()!!



        // Register associated device
@@ -138,8 +138,8 @@ class CompanionDeviceManagerSnippet : Snippet { 
     */

    @Rpc(description = "Start permissions sync.")

    fun startPermissionsSync(associationId: Int) {

        val pendingIntent = companionDeviceManager

            .buildPermissionTransferUserConsentIntent(associationId)

        val pendingIntent = checkNotNull(companionDeviceManager

            .buildPermissionTransferUserConsentIntent(associationId))

        CompanionActivity.launchAndWait(context)

        CompanionActivity.startIntentSender(pendingIntent)

        confirmationUi.waitUntilSystemDataTransferConfirmationVisible()