diff options
| -rw-r--r-- | core/proto/android/providers/settings/global.proto | 6 | ||||
| -rw-r--r-- | 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 c7de947cdca9..b5303c8a4eec 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 f29f57f1c197..1ef36df8121f 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 |