summaryrefslogtreecommitdiff
path: root/core/proto
diff options
context:
space:
mode:
authorSarah Chin <sarahchin@google.com>2020-06-23 17:39:41 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-06-23 17:39:41 +0000
commitb12ae8957192715931e8a99842edc168c5fd50d8 (patch)
tree4ea8c65199262e6c2a52532c3f9bcaa0c0815838 /core/proto
parent51e93653f63bef45e9ebff97b6fe8a5b3305ffd7 (diff)
parent957f0a5285b20fdfde96278070ec19633516ebf9 (diff)
Merge "Add Setting for NR screen off indications"
Diffstat (limited to 'core/proto')
-rw-r--r--core/proto/android/providers/settings/global.proto4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto
index 829e1f7d0d96..cd4a1c8d77a8 100644
--- a/core/proto/android/providers/settings/global.proto
+++ b/core/proto/android/providers/settings/global.proto
@@ -693,6 +693,8 @@ message GlobalSettingsProto {
}
optional Notification notification = 82;
+ optional SettingProto nr_nsa_tracking_screen_off_mode = 153 [ (android.privacy).dest = DEST_AUTOMATIC ];
+
optional SettingProto nsd_on = 83 [ (android.privacy).dest = DEST_AUTOMATIC ];
message Ntp {
@@ -1052,5 +1054,5 @@ message GlobalSettingsProto {
// Please insert fields in alphabetical order and group them into messages
// if possible (to avoid reaching the method limit).
- // Next tag = 151;
+ // Next tag = 154;
}