Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12912d71 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents ee1661f7 15caf835
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -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;

+3 −3
Original line number Diff line number Diff line
@@ -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