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

Merge "Don't append userIds for the current user's clipData uris." into nyc-mr1-dev

Browse Source
This commit is contained in:
Nicolas Prévot
2016-07-19 16:06:43 +00:00
committed by Android (Google) Code Review
parent fb0ec9de84 58926243e0
commit e723ed8b51
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/content/ClipData.java
View File

@@ -191,6 +191,14 @@ public class ClipData implements Parcelable {
final Intent mIntent;
Uri mUri;
/** @hide */
public Item(Item other) {
mText = other.mText;
mHtmlText = other.mHtmlText;
mIntent = other.mIntent;
mUri = other.mUri;
}
/**
* Create an Item consisting of a single block of (possibly styled) text.
*/
@@ -816,6 +824,11 @@ public class ClipData implements Parcelable {
return mItems.get(index);
}
/** @hide */
public void setItemAt(int index, Item item) {
mItems.set(index, item);
}
/**
* Prepare this {@link ClipData} to leave an app process.
*

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

@@ -188,6 +188,14 @@ public class ClipboardService extends IClipboard.Stub {
if (!canCopy) {
clip = null;
} else {
// We want to fix the uris of the related user's clip without changing the
// uris of the current user's clip.
// So, copy the ClipData, and then copy all the items, so that nothing
// is shared in memmory.
clip = new ClipData(clip);
for (int i = clip.getItemCount() - 1; i >= 0; i--) {
clip.setItemAt(i, new ClipData.Item(clip.getItemAt(i)));
}
clip.fixUrisLight(userId);
}
for (int i = 0; i < size; i++) {