From f0a8ccfcd370d26b3887fc8428dedf5596f42ca8 Mon Sep 17 00:00:00 2001 From: erfanian Date: Mon, 19 Jun 2017 19:08:41 -0700 Subject: Remove LITE scrub annotations from protos. Copybara will do this on export. Test: TH PiperOrigin-RevId: 159512079 Change-Id: If47ac04c42f8cc1f56e5d761d4ab1f1b6f17b57e --- java/com/android/dialer/backup/proto/voicemail_info.proto | 1 + java/com/android/dialer/calldetails/proto/call_details_entries.proto | 1 + java/com/android/dialer/callintent/call_initiation_type.proto | 1 + java/com/android/dialer/callintent/call_specific_app_data.proto | 1 + java/com/android/dialer/dialercontact/dialer_contact.proto | 1 + .../dialer/enrichedcall/historyquery/proto/history_result.proto | 1 + java/com/android/dialer/logging/contact_lookup_result.proto | 1 + java/com/android/dialer/logging/contact_source.proto | 1 + java/com/android/dialer/logging/dialer_impression.proto | 1 + java/com/android/dialer/logging/interaction_event.proto | 1 + java/com/android/dialer/logging/reporting_location.proto | 1 + java/com/android/dialer/logging/screen_event.proto | 1 + java/com/android/dialer/logging/ui_action.proto | 1 + java/com/android/dialer/phonenumberproto/dialer_phone_number.proto | 3 ++- 14 files changed, 15 insertions(+), 1 deletion(-) diff --git a/java/com/android/dialer/backup/proto/voicemail_info.proto b/java/com/android/dialer/backup/proto/voicemail_info.proto index b74cce954..749768359 100644 --- a/java/com/android/dialer/backup/proto/voicemail_info.proto +++ b/java/com/android/dialer/backup/proto/voicemail_info.proto @@ -4,6 +4,7 @@ option java_package = "com.android.dialer.backup"; option java_multiple_files = true; option optimize_for = LITE_RUNTIME; + package com.android.dialer.backup; // Next id: 20 diff --git a/java/com/android/dialer/calldetails/proto/call_details_entries.proto b/java/com/android/dialer/calldetails/proto/call_details_entries.proto index e254b7713..18bc931cb 100644 --- a/java/com/android/dialer/calldetails/proto/call_details_entries.proto +++ b/java/com/android/dialer/calldetails/proto/call_details_entries.proto @@ -4,6 +4,7 @@ option java_package = "com.android.dialer.calldetails"; option java_multiple_files = true; option optimize_for = LITE_RUNTIME; + import "java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto"; package com.android.dialer.calldetails; diff --git a/java/com/android/dialer/callintent/call_initiation_type.proto b/java/com/android/dialer/callintent/call_initiation_type.proto index 3caf0305b..6b85fbf81 100644 --- a/java/com/android/dialer/callintent/call_initiation_type.proto +++ b/java/com/android/dialer/callintent/call_initiation_type.proto @@ -4,6 +4,7 @@ option java_package = "com.android.dialer.callintent"; option java_multiple_files = true; option optimize_for = LITE_RUNTIME; + package com.android.dialer.callintent; diff --git a/java/com/android/dialer/callintent/call_specific_app_data.proto b/java/com/android/dialer/callintent/call_specific_app_data.proto index 766449f71..1d024d3a3 100644 --- a/java/com/android/dialer/callintent/call_specific_app_data.proto +++ b/java/com/android/dialer/callintent/call_specific_app_data.proto @@ -4,6 +4,7 @@ option java_package = "com.android.dialer.callintent"; option java_multiple_files = true; option optimize_for = LITE_RUNTIME; + package com.android.dialer.callintent; import "java/com/android/dialer/callintent/call_initiation_type.proto"; diff --git a/java/com/android/dialer/dialercontact/dialer_contact.proto b/java/com/android/dialer/dialercontact/dialer_contact.proto index 9b7724f5a..d63295bcd 100644 --- a/java/com/android/dialer/dialercontact/dialer_contact.proto +++ b/java/com/android/dialer/dialercontact/dialer_contact.proto @@ -4,6 +4,7 @@ option java_package = "com.android.dialer.dialercontact"; option java_multiple_files = true; option optimize_for = LITE_RUNTIME; + package com.android.dialer.callcomposer; message DialerContact { diff --git a/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto b/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto index 62d013a46..8efb35cc1 100644 --- a/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto +++ b/java/com/android/dialer/enrichedcall/historyquery/proto/history_result.proto @@ -4,6 +4,7 @@ option java_package = "com.android.dialer.enrichedcall.historyquery.proto"; option java_multiple_files = true; option optimize_for = LITE_RUNTIME; + package com.android.dialer.enrichedcall.historyquery.proto; // Holds data that was used in an enrichedcall in the past diff --git a/java/com/android/dialer/logging/contact_lookup_result.proto b/java/com/android/dialer/logging/contact_lookup_result.proto index 5237c6887..6c83908b9 100644 --- a/java/com/android/dialer/logging/contact_lookup_result.proto +++ b/java/com/android/dialer/logging/contact_lookup_result.proto @@ -7,6 +7,7 @@ option optimize_for = LITE_RUNTIME; + message ContactLookupResult { // The different results of a contact lookup done using a phone number. enum Type { diff --git a/java/com/android/dialer/logging/contact_source.proto b/java/com/android/dialer/logging/contact_source.proto index 9504c64ed..3a24da1d0 100644 --- a/java/com/android/dialer/logging/contact_source.proto +++ b/java/com/android/dialer/logging/contact_source.proto @@ -7,6 +7,7 @@ option optimize_for = LITE_RUNTIME; + message ContactSource { // Applies only to reports made from call history. If we have contact // information for the phone number, this field indicates its source. diff --git a/java/com/android/dialer/logging/dialer_impression.proto b/java/com/android/dialer/logging/dialer_impression.proto index 4e96a5073..465c0c318 100644 --- a/java/com/android/dialer/logging/dialer_impression.proto +++ b/java/com/android/dialer/logging/dialer_impression.proto @@ -7,6 +7,7 @@ option optimize_for = LITE_RUNTIME; + message DialerImpression { // Event enums to be used for Impression Logging in Dialer. // It's perfectly acceptable for this enum to be large diff --git a/java/com/android/dialer/logging/interaction_event.proto b/java/com/android/dialer/logging/interaction_event.proto index 3d14a1a2d..47ea53461 100644 --- a/java/com/android/dialer/logging/interaction_event.proto +++ b/java/com/android/dialer/logging/interaction_event.proto @@ -7,6 +7,7 @@ option optimize_for = LITE_RUNTIME; + message InteractionEvent { // Next Tag: 38 enum Type { diff --git a/java/com/android/dialer/logging/reporting_location.proto b/java/com/android/dialer/logging/reporting_location.proto index ddaa37331..3c1baf0fe 100644 --- a/java/com/android/dialer/logging/reporting_location.proto +++ b/java/com/android/dialer/logging/reporting_location.proto @@ -7,6 +7,7 @@ option optimize_for = LITE_RUNTIME; + message ReportingLocation { // Spam reporting location enum Type { diff --git a/java/com/android/dialer/logging/screen_event.proto b/java/com/android/dialer/logging/screen_event.proto index ddf663286..603f7104e 100644 --- a/java/com/android/dialer/logging/screen_event.proto +++ b/java/com/android/dialer/logging/screen_event.proto @@ -7,6 +7,7 @@ option optimize_for = LITE_RUNTIME; + message ScreenEvent { enum Type { diff --git a/java/com/android/dialer/logging/ui_action.proto b/java/com/android/dialer/logging/ui_action.proto index f1cbdf8bd..886fe04eb 100644 --- a/java/com/android/dialer/logging/ui_action.proto +++ b/java/com/android/dialer/logging/ui_action.proto @@ -7,6 +7,7 @@ option optimize_for = LITE_RUNTIME; + message UiAction { enum Type { UNKNOWN = 0; diff --git a/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto b/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto index a0f362631..97b7519dd 100644 --- a/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto +++ b/java/com/android/dialer/phonenumberproto/dialer_phone_number.proto @@ -18,6 +18,7 @@ option java_package = "com.android.dialer"; option java_multiple_files = true; option optimize_for = LITE_RUNTIME; + package com.android.dialer; // A phone number for use in the dialer application. It consists of a @@ -169,4 +170,4 @@ message DialerInternalPhoneNumber { // Google Italy, +39 02-36618 300, 02-36618 300 // country_code: 39 // national_number: 236618300 -// italian_leading_zero: true \ No newline at end of file +// italian_leading_zero: true -- cgit v1.2.3