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

Merge "Fix cross-user clipboard issue." into sc-dev

Browse Source
This commit is contained in:
Oli Lan
2021-03-02 09:09:15 +00:00
committed by Android (Google) Code Review
parent e6b7ca4b95 1cc6671bf3
commit 80756895f2
1 changed files with 3 additions and 3 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

@@ -880,8 +880,8 @@ public class ClipboardService extends SystemService {
CharSequence sourceAppLabel = null;
if (clipboard.mPrimaryClipPackage != null) {
try {
sourceAppLabel = mPm.getApplicationLabel(
mPm.getApplicationInfo(clipboard.mPrimaryClipPackage, 0));
sourceAppLabel = mPm.getApplicationLabel(mPm.getApplicationInfoAsUser(
clipboard.mPrimaryClipPackage, 0, userId));
} catch (PackageManager.NameNotFoundException e) {
// leave label as null
}
@@ -889,7 +889,7 @@ public class ClipboardService extends SystemService {
try {
CharSequence callingAppLabel = mPm.getApplicationLabel(
mPm.getApplicationInfo(callingPackage, 0));
mPm.getApplicationInfoAsUser(callingPackage, 0, userId));
String message;
if (sourceAppLabel != null) {
message = callingAppLabel + " pasted from " + sourceAppLabel;