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

Commit c5f5a9a0 authored by Prem Edhara's avatar Prem Edhara Committed by Automerger Merge Worker
Browse files

Merge "Allow multiple permission sync consent requests" into udc-dev am: e85def5d 

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



Change-Id: I742b9a73c9bb8c7900d16e55063bcdea5216b5f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1653c173 e85def5d

services/companion/java/com/android/server/companion/datatransfer/SystemDataTransferProcessor.java

+0 −12
Original line number Diff line number Diff line
@@ -133,18 +133,6 @@ public class SystemDataTransferProcessor { 
            @UserIdInt int userId, int associationId) {

        final AssociationInfo association = resolveAssociation(packageName, userId, associationId);



        // Check if the request's data type has been requested before.

        List<SystemDataTransferRequest> storedRequests =

                mSystemDataTransferRequestStore.readRequestsByAssociationId(userId,

                        associationId);

        for (SystemDataTransferRequest storedRequest : storedRequests) {

            if (storedRequest instanceof PermissionSyncRequest) {

                Slog.e(LOG_TAG, "The request has been sent before, you can not send "

                        + "the same request type again.");

                return null;

            }

        }



        Slog.i(LOG_TAG, "Creating permission sync intent for userId [" + userId

                + "] associationId [" + associationId + "]");