Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 3c0eeb951f

Change-Id: Id4d23405bfb8e2f214aca9533f2f1f57bac8575c
This commit is contained in:
Feng Cao
2019-05-28 22:58:56 -07:00
committed by android-build-merger
parent b326363d94 3c0eeb951f
commit 437d6fe499
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/clipboard/ClipboardService.java
View File

@@ -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