Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Creating java package for Privacy proto." into pi-dev

Browse Source 
am: 12912d71b1

Change-Id: If1f06051aede2003fc72ba84ef70a81e2f3965f6
This commit is contained in:
Kweku Adams
2018-03-30 10:36:47 +00:00
committed by android-build-merger
parent b407389280 12912d71b1
commit 2a158b0fa7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/proto/android/providers/settings/global.proto
View File

@@ -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;

6
libs/incident/proto/android/privacy.proto
View File

@@ -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