Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 788e74a6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 15db763b cb89f62e

core/proto/android/content/clipdata.proto

+2 −2
Original line number Diff line number Diff line
@@ -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;

core/proto/android/server/jobscheduler.proto

+6 −0
Original line number Diff line number Diff line
@@ -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;