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

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

Merge "incidentd: Adding privacy tag and expanding field."

parents 618e8602 99546338

core/java/android/service/notification/Condition.java

+17 −1
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ package android.service.notification; 


import android.annotation.IntDef;

import android.annotation.SystemApi;

import android.app.AutomaticZenRule;

import android.content.Context;

import android.net.Uri;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.proto.ProtoOutputStream;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -161,6 +161,22 @@ public final class Condition implements Parcelable { 
            .append(']').toString();

    }



    /** @hide */

    public void writeToProto(ProtoOutputStream proto, long fieldId) {

        final long token = proto.start(fieldId);



        // id is guarantreed not to be null.

        proto.write(ConditionProto.ID, id.toString());

        proto.write(ConditionProto.SUMMARY, summary);

        proto.write(ConditionProto.LINE_1, line1);

        proto.write(ConditionProto.LINE_2, line2);

        proto.write(ConditionProto.ICON, icon);

        proto.write(ConditionProto.STATE, state);

        proto.write(ConditionProto.FLAGS, flags);



        proto.end(token);

    }



    @SystemApi

    public static String stateToString(int state) {

        if (state == STATE_FALSE) return "STATE_FALSE";

core/java/android/service/notification/ZenModeConfig.java

+25 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.text.format.DateFormat; 
import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.Slog;

import android.util.proto.ProtoOutputStream;



import com.android.internal.R;
@@ -1262,6 +1263,30 @@ public class ZenModeConfig implements Parcelable { 
                    .append(']').toString();

        }



        /** @hide */

        public void writeToProto(ProtoOutputStream proto, long fieldId) {

            final long token = proto.start(fieldId);



            proto.write(ZenRuleProto.ID, id);

            proto.write(ZenRuleProto.NAME, name);

            proto.write(ZenRuleProto.CREATION_TIME_MS, creationTime);

            proto.write(ZenRuleProto.ENABLED, enabled);

            proto.write(ZenRuleProto.ENABLER, enabler);

            proto.write(ZenRuleProto.IS_SNOOZING, snoozing);

            proto.write(ZenRuleProto.ZEN_MODE, zenMode);

            if (conditionId != null) {

                proto.write(ZenRuleProto.CONDITION_ID, conditionId.toString());

            }

            if (condition != null) {

                condition.writeToProto(proto, ZenRuleProto.CONDITION);

            }

            if (component != null) {

                component.writeToProto(proto, ZenRuleProto.COMPONENT);

            }



            proto.end(token);

        }



        private static void appendDiff(Diff d, String item, ZenRule from, ZenRule to) {

            if (d == null) return;

            if (from == null) {

core/proto/android/app/notification.proto

+2 −2
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ syntax = "proto2"; 
option java_package = "android.app";

option java_multiple_files = true;



import "frameworks/base/libs/incident/proto/android/privacy.proto";



package android.app;



import "frameworks/base/libs/incident/proto/android/privacy.proto";



/**

 * An android.app.Notification object.

 * Deprecated fields are not included in the proto.

core/proto/android/app/notification_channel.proto

+8 −5
Original line number Diff line number Diff line
@@ -21,19 +21,22 @@ option java_multiple_files = true; 
package android.app;



import "frameworks/base/core/proto/android/media/audioattributes.proto";

import "frameworks/base/libs/incident/proto/android/privacy.proto";



/**

 * An android.app.NotificationChannel object.

 */

message NotificationChannelProto {

    optional string id = 1;

    optional string name = 2;

    optional string description = 3;

    option (.android.msg_privacy).dest = DEST_AUTOMATIC;



    optional string id = 1 [ (android.privacy).dest = DEST_EXPLICIT ];

    optional string name = 2 [ (android.privacy).dest = DEST_EXPLICIT ];

    optional string description = 3 [ (android.privacy).dest = DEST_EXPLICIT ];

    optional int32 importance = 4;

    optional bool can_bypass_dnd = 5;

    // Default is VISIBILITY_NO_OVERRIDE (-1000).

    optional int32 lockscreen_visibility = 6;

    optional string sound = 7;

    optional string sound = 7 [ (android.privacy).dest = DEST_EXPLICIT ];

    optional bool use_lights = 8;

    // Default is 0.

    optional int32 light_color = 9;
@@ -46,7 +49,7 @@ message NotificationChannelProto { 
    optional bool show_badge = 13;

    // Default is false.

    optional bool is_deleted = 14;

    optional string group = 15;

    optional string group = 15 [ (android.privacy).dest = DEST_EXPLICIT ];

    optional android.media.AudioAttributesProto audio_attributes = 16;

    // If this is a blockable system notification channel.

    optional bool is_blockable_system = 17;

core/proto/android/app/notification_channel_group.proto

+3 −0
Original line number Diff line number Diff line
@@ -21,11 +21,14 @@ option java_multiple_files = true; 
package android.app;



import "frameworks/base/core/proto/android/app/notification_channel.proto";

import "frameworks/base/libs/incident/proto/android/privacy.proto";



/**

 * An android.app.NotificationChannelGroup object.

 */

message NotificationChannelGroupProto {

    option (.android.msg_privacy).dest = DEST_EXPLICIT;



    optional string id = 1;

    optional string name = 2;

    optional string description = 3;