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

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

Merge "Updating incident protos."

parents d4aed751 87c60a02

core/java/android/view/RemoteAnimationTarget.java

+10 −10
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 


package android.view;



import static android.app.RemoteAnimationTargetProto.CLIP_RECT;

import static android.app.RemoteAnimationTargetProto.CONTENT_INSETS;

import static android.app.RemoteAnimationTargetProto.IS_TRANSLUCENT;

import static android.app.RemoteAnimationTargetProto.LEASH;

import static android.app.RemoteAnimationTargetProto.MODE;

import static android.app.RemoteAnimationTargetProto.POSITION;

import static android.app.RemoteAnimationTargetProto.PREFIX_ORDER_INDEX;

import static android.app.RemoteAnimationTargetProto.SOURCE_CONTAINER_BOUNDS;

import static android.app.RemoteAnimationTargetProto.TASK_ID;

import static android.app.RemoteAnimationTargetProto.WINDOW_CONFIGURATION;

import static android.view.RemoteAnimationTargetProto.CLIP_RECT;

import static android.view.RemoteAnimationTargetProto.CONTENT_INSETS;

import static android.view.RemoteAnimationTargetProto.IS_TRANSLUCENT;

import static android.view.RemoteAnimationTargetProto.LEASH;

import static android.view.RemoteAnimationTargetProto.MODE;

import static android.view.RemoteAnimationTargetProto.POSITION;

import static android.view.RemoteAnimationTargetProto.PREFIX_ORDER_INDEX;

import static android.view.RemoteAnimationTargetProto.SOURCE_CONTAINER_BOUNDS;

import static android.view.RemoteAnimationTargetProto.TASK_ID;

import static android.view.RemoteAnimationTargetProto.WINDOW_CONFIGURATION;



import android.annotation.IntDef;

import android.app.WindowConfiguration;

core/proto/android/app/alarmmanager.proto

+1 −1
Original line number Diff line number Diff line
@@ -53,5 +53,5 @@ message AlarmClockInfoProto { 
    // This value is UTC wall clock time in milliseconds, as returned by

    // System#currentTimeMillis() for example.

    optional int64 trigger_time_ms = 1;

    optional android.app.PendingIntentProto show_intent = 2;

    optional PendingIntentProto show_intent = 2;

}

core/proto/android/app/notification.proto

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



syntax = "proto2";

option java_package = "android.app";

option java_multiple_files = true;



package android.app;

core/proto/android/app/notification_channel.proto

+4 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



syntax = "proto2";

option java_package = "android.app";

option java_multiple_files = true;



package android.app;
@@ -29,8 +28,11 @@ import "frameworks/base/libs/incident/proto/android/privacy.proto"; 
message NotificationChannelProto {

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



    // Notification Channel ID. Provided by the app.

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

    // User-visible Notification Channel name. Provided by the app.

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

    // User-visible Notification Channel description. Provided by the app.

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

    optional int32 importance = 4;

    optional bool can_bypass_dnd = 5;
@@ -49,6 +51,7 @@ message NotificationChannelProto { 
    optional bool show_badge = 13;

    // Default is false.

    optional bool is_deleted = 14;

    // Provided by the app but will match a NotificationChannelGroup id.

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

    optional android.media.AudioAttributesProto audio_attributes = 16;

    // If this is a blockable system notification channel.

core/proto/android/app/notification_channel_group.proto

+4 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



syntax = "proto2";

option java_package = "android.app";

option java_multiple_files = true;



package android.app;
@@ -29,9 +28,12 @@ import "frameworks/base/libs/incident/proto/android/privacy.proto"; 
message NotificationChannelGroupProto {

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



    // Notification Channel Group ID. Provided by the app.

    optional string id = 1;

    // User-visible Notification Channel Group name.

    optional string name = 2;

    // User-visible Notification Channel Group description.

    optional string description = 3;

    optional bool is_blocked = 4;

    repeated android.app.NotificationChannelProto channels = 5;

    repeated NotificationChannelProto channels = 5;

}