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

Commit 3904558d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26948447'] into 24Q2-release.

Change-Id: I334db150aad46ff94197e13fa1ef1ec70d5dd066
parents e5623018 324e370c
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1271,9 +1271,9 @@ public class CompanionDeviceManagerService extends SystemService {
                @NonNull ParcelFileDescriptor out, @NonNull ParcelFileDescriptor err,
                @NonNull String[] args) {
            return new CompanionDeviceShellCommand(CompanionDeviceManagerService.this,
                    mAssociationStore, mDevicePresenceProcessor, mTransportManager,
                    mAssociationStore, mDevicePresenceMonitor, mTransportManager,
                    mSystemDataTransferProcessor, mAssociationRequestsProcessor,
                    mBackupRestoreProcessor, mDisassociationProcessor)
                    mBackupRestoreProcessor, mAssociationRevokeProcessor)
                    .exec(this, in.getFileDescriptor(), out.getFileDescriptor(),
                            err.getFileDescriptor(), args);
        }