Merge "Fix clipboard permission issue for AugmentedAutofillService provider." into qt-dev

am: 3c0eeb951f

Change-Id: I0a54efe3583720c9d4d70731c248b6117ac073b1

1 files changed, 2 insertions, 4 deletions

diff --git a/services/core/java/com/android/server/clipboard/ClipboardService.java b/services/core/java/com/android/server/clipboard/ClipboardService.java
index af25ad56a2a7..b279b370c611 100644
--- a/services/core/java/com/android/server/clipboard/ClipboardService.java
+++ b/services/core/java/com/android/server/clipboard/ClipboardService.java
@@ -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