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

Commit 56904d05 authored by Feng Cao's avatar Feng Cao
Browse files

Fix clipboard permission issue for AugmentedAutofillService provider. 

Test: atest CtsAutoFillServiceTestCases:android.autofillservice.cts.augmented.ClipboardAccessTest
Fixes: 133324239

Change-Id: I3b46f022e1c65b28c397544851c4b402b5066cdc
parent 0fa7a54e

services/core/java/com/android/server/clipboard/ClipboardService.java

+2 −4
Original line number Diff line number Diff line
@@ -775,8 +775,7 @@ public class ClipboardService extends SystemService { 
                    // if the application has the permission, let it to access user's clipboard.

                    // To passed synthesized uid user#10_app#systemui may not tell the real uid.

                    // userId must pass intending userId. i.e. user#10.

                    allowed = mContentCaptureInternal.isContentCaptureServiceForUser(

                            Binder.getCallingUid(), userId);

                    allowed = mContentCaptureInternal.isContentCaptureServiceForUser(uid, userId);

                }

                if (!allowed && mAutofillInternal != null) {

                    // ...or the Augmented Autofill Service
@@ -785,8 +784,7 @@ public class ClipboardService extends SystemService { 
                    // if the application has the permission, let it to access user's clipboard.

                    // To passed synthesized uid user#10_app#systemui may not tell the real uid.

                    // userId must pass intending userId. i.e. user#10.

                    allowed = mAutofillInternal.isAugmentedAutofillServiceForUser(

                            Binder.getCallingUid(), userId);

                    allowed = mAutofillInternal.isAugmentedAutofillServiceForUser(uid, userId);

                }

                if (!allowed) {

                    Slog.e(TAG, "Denying clipboard access to " + callingPackage