From cb89f62ef8b03f6e5f28a3fb5f473ebd79d4af41 Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Thu, 22 Mar 2018 13:55:46 -0700 Subject: [PATCH] Marking ClipData as LOCAL and adding comment in jobscheduler proto. Bug: 74837756 Bug: 74975371 Test: N/A Change-Id: I099343f933ae091a52ecb9fc780baa981d1ef677 --- core/proto/android/content/clipdata.proto | 4 ++-- core/proto/android/server/jobscheduler.proto | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/proto/android/content/clipdata.proto b/core/proto/android/content/clipdata.proto index aeeef977d4013..cbc00a7970c16 100644 --- a/core/proto/android/content/clipdata.proto +++ b/core/proto/android/content/clipdata.proto @@ -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; diff --git a/core/proto/android/server/jobscheduler.proto b/core/proto/android/server/jobscheduler.proto index 122e5c48214d2..20dbfc047dee8 100644 --- a/core/proto/android/server/jobscheduler.proto +++ b/core/proto/android/server/jobscheduler.proto @@ -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;