From 773ea15f5e3db5cd952e3916e828da55b098d9f3 Mon Sep 17 00:00:00 2001 From: hai007 Date: Fri, 26 Feb 2021 09:13:15 -0800 Subject: [PATCH] Internal change PiperOrigin-RevId: 359771717 --- proto/bootstrap_enums.proto | 3 --- proto/connections_enums.proto | 3 --- proto/discovery_enums.proto | 14 +++++++++----- proto/magic_pair_enums.proto | 3 --- proto/nearby_client_enums.proto | 3 --- proto/nearby_event_codes.proto | 3 --- proto/setup_enums.proto | 3 --- proto/sharing_enums.proto | 3 --- 8 files changed, 9 insertions(+), 26 deletions(-) diff --git a/proto/bootstrap_enums.proto b/proto/bootstrap_enums.proto index 236a81c9..01eb2969 100644 --- a/proto/bootstrap_enums.proto +++ b/proto/bootstrap_enums.proto @@ -16,11 +16,8 @@ syntax = "proto2"; package location.nearby.proto; -import "logs/proto/logs_annotations/logs_annotations.proto"; option optimize_for = LITE_RUNTIME; -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "BootstrapEnums"; diff --git a/proto/connections_enums.proto b/proto/connections_enums.proto index db6dc409..4674a4cf 100644 --- a/proto/connections_enums.proto +++ b/proto/connections_enums.proto @@ -16,11 +16,8 @@ syntax = "proto2"; package location.nearby.proto.connections; -import "logs/proto/logs_annotations/logs_annotations.proto"; option optimize_for = LITE_RUNTIME; -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "ConnectionsEnums"; option objc_class_prefix = "GNCP"; diff --git a/proto/discovery_enums.proto b/proto/discovery_enums.proto index 89d5f1cf..19901df4 100644 --- a/proto/discovery_enums.proto +++ b/proto/discovery_enums.proto @@ -16,16 +16,12 @@ syntax = "proto2"; package location.nearby.proto; -import "logs/proto/logs_annotations/logs_annotations.proto"; option optimize_for = LITE_RUNTIME; -option jspb_use_correct_proto2_semantics = false; // go/jspb-correct-proto2 -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "DiscoveryEnums"; -// NEXT ID: 147 +// NEXT ID: 148 enum DiscoveryEvent { UNKNOWN_DISCOVERY_EVENT = 0; @@ -452,6 +448,14 @@ enum DiscoveryEvent { // Half sheet is dismissed by users. HALF_SHEET_PAIR_RETROACTIVE_DISMISSED = 145; + // User dismiss halfsheet but device get bluetooth connection event after + // certain time + HALF_SHEET_CONNECTION_AFTER_DISMISS = 146; + + // User ban halfsheet but device get bluetooth connection event after certain + // time + HALF_SHEET_CONNECTION_AFTER_BAN = 147; + // Deprecated. reserved 65, 67 to 72; } diff --git a/proto/magic_pair_enums.proto b/proto/magic_pair_enums.proto index 58b767f4..a0633f9b 100644 --- a/proto/magic_pair_enums.proto +++ b/proto/magic_pair_enums.proto @@ -16,11 +16,8 @@ syntax = "proto2"; package location.nearby.proto; -import "logs/proto/logs_annotations/logs_annotations.proto"; option optimize_for = LITE_RUNTIME; -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "MagicPairEnums"; option objc_class_prefix = "GNCP"; diff --git a/proto/nearby_client_enums.proto b/proto/nearby_client_enums.proto index 25a11831..42cef7f8 100644 --- a/proto/nearby_client_enums.proto +++ b/proto/nearby_client_enums.proto @@ -16,11 +16,8 @@ syntax = "proto2"; package location.nearby.proto; -import "logs/proto/logs_annotations/logs_annotations.proto"; option optimize_for = LITE_RUNTIME; -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "NearbyClientEnums"; option objc_class_prefix = "GNCP"; diff --git a/proto/nearby_event_codes.proto b/proto/nearby_event_codes.proto index 8236f772..7d0939e0 100644 --- a/proto/nearby_event_codes.proto +++ b/proto/nearby_event_codes.proto @@ -16,11 +16,8 @@ syntax = "proto2"; package location.nearby.proto; -import "logs/proto/logs_annotations/logs_annotations.proto"; option optimize_for = LITE_RUNTIME; -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "NearbyEventCodes"; diff --git a/proto/setup_enums.proto b/proto/setup_enums.proto index a74fc401..3906798b 100644 --- a/proto/setup_enums.proto +++ b/proto/setup_enums.proto @@ -16,11 +16,8 @@ syntax = "proto2"; package location.nearby.proto.setup; -import "logs/proto/logs_annotations/logs_annotations.proto"; option optimize_for = LITE_RUNTIME; -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "SetupEnums"; option objc_class_prefix = "GNSP"; diff --git a/proto/sharing_enums.proto b/proto/sharing_enums.proto index 43bb519f..a905e1be 100644 --- a/proto/sharing_enums.proto +++ b/proto/sharing_enums.proto @@ -16,11 +16,8 @@ syntax = "proto2"; package location.nearby.proto.sharing; -import "logs/proto/logs_annotations/logs_annotations.proto"; option optimize_for = LITE_RUNTIME; -option (logs_proto.file_not_used_for_logging_except_enums) = true; -option java_api_version = 2; option java_package = "com.google.location.nearby.proto"; option java_outer_classname = "SharingEnums"; option objc_class_prefix = "GNSHP";