From 15caf835ec5761e35db698f1f270c25b3a9e639d Mon Sep 17 00:00:00 2001 From: Kweku Adams Date: Thu, 29 Mar 2018 14:26:23 -0700 Subject: [PATCH] Creating java package for Privacy proto. Also setting fields in the GlobalSettingsProto.Private message to LOCAL. Bug: 72814439 Bug: 74975371 Test: flash device and check incident.proto output Change-Id: Ia580144b8b0d0cb9bd9a3297a37213ed5f60a514 --- core/proto/android/providers/settings/global.proto | 6 ++++-- libs/incident/proto/android/privacy.proto | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto index c7de947cdca9a..b5303c8a4eec9 100644 --- a/core/proto/android/providers/settings/global.proto +++ b/core/proto/android/providers/settings/global.proto @@ -672,8 +672,10 @@ message GlobalSettingsProto { option (android.msg_privacy).dest = DEST_LOCAL; // The requested Private DNS mode and an accompanying specifier. - optional SettingProto dns_mode = 1; - optional SettingProto dns_specifier = 2; + // msg_privacy settings don't apply to sub messages, only to primitive + // fields, so these must also be explicitly set to LOCAL. + optional SettingProto dns_mode = 1 [ (android.privacy).dest = DEST_LOCAL ]; + optional SettingProto dns_specifier = 2 [ (android.privacy).dest = DEST_LOCAL ]; } optional Private private = 96; diff --git a/libs/incident/proto/android/privacy.proto b/libs/incident/proto/android/privacy.proto index f29f57f1c1976..1ef36df8121fe 100644 --- a/libs/incident/proto/android/privacy.proto +++ b/libs/incident/proto/android/privacy.proto @@ -16,13 +16,13 @@ syntax = "proto2"; -option java_package = "android"; +package android; + +option java_package = "com.android.incident"; option java_multiple_files = true; import "google/protobuf/descriptor.proto"; -package android; - enum Destination { // Fields or messages annotated with DEST_LOCAL must never be // extracted from the device automatically. They can be accessed