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

Merge "Marking ClipData as LOCAL and adding comment in jobscheduler proto." into pi-dev

Browse Source 
am: 788e74a613

Change-Id: Ib03f55dd91feb08b9f6f91238d8ea8cbaabcbd2d
This commit is contained in:
Kweku Adams
2018-03-28 00:17:59 +00:00
committed by android-build-merger
parent 4a79ab8450 788e74a613
commit 671ae9b825
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/proto/android/content/clipdata.proto
View File

@@ -25,7 +25,7 @@ import "frameworks/base/libs/incident/proto/android/privacy.proto";
// An android.content.ClipData object.
message ClipDataProto {
option (.android.msg_privacy).dest = DEST_AUTOMATIC;
option (.android.msg_privacy).dest = DEST_LOCAL;
optional android.content.ClipDescriptionProto description = 1;
@@ -40,7 +40,7 @@ message ClipDataProto {
// An android.content.ClipData.Item object.
message Item {
option (.android.msg_privacy).dest = DEST_EXPLICIT;
option (.android.msg_privacy).dest = DEST_LOCAL;
oneof data {
string html_text = 1;

6
core/proto/android/server/jobscheduler.proto
View File

@@ -578,6 +578,12 @@ message JobStatusDumpProto {
optional .android.os.PersistableBundleProto extras = 14;
optional .android.os.BundleProto transient_extras = 15;
// ClipData of information that is returned to the application at
// execution time, but not persisted by the system. This is provided by
// the app and the main purpose of providing a ClipData is to allow
// granting of URI permissions for data associated with the clip. The
// exact kind of permission grant to perform is specified in the flags
// field.
optional .android.content.ClipDataProto clip_data = 16;
optional GrantedUriPermissionsDumpProto granted_uri_permissions = 17;