diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-24 16:05:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-24 16:05:11 +0000 |
| commit | 8940f104023d8795903dd7fb7077cebe300f52ce (patch) | |
| tree | 61b35fe91f66e04ee0724edbca7b4b89b4a5e934 /core/proto | |
| parent | 35d81ecd4f85953379c9e53cccd7698cd87de662 (diff) | |
| parent | b0df5801931896ae2c8bfdeff6bade405f7f33ef (diff) | |
Merge "Add a SettingsProvider key for Adaptive connectivity" into rvc-qpr-dev am: b0df580193
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12383606
Change-Id: I7421c1f07d89d1b7c5371c83ed8a94f7f4ae9c71
Diffstat (limited to 'core/proto')
| -rw-r--r-- | core/proto/android/app/settings_enums.proto | 5 | ||||
| -rw-r--r-- | core/proto/android/providers/settings/secure.proto | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/proto/android/app/settings_enums.proto b/core/proto/android/app/settings_enums.proto index b3b464de9437..90081128b26d 100644 --- a/core/proto/android/app/settings_enums.proto +++ b/core/proto/android/app/settings_enums.proto @@ -2683,4 +2683,9 @@ enum PageId { // CATEGORY: SETTINGS // OS: R MEDIA_CONTROLS_SETTINGS = 1845; + + // OPEN: Settings > Network & internet > Adaptive connectivity + // CATEGORY: SETTINGS + // OS: R QPR + ADAPTIVE_CONNECTIVITY_CATEGORY = 1850; } diff --git a/core/proto/android/providers/settings/secure.proto b/core/proto/android/providers/settings/secure.proto index fe8a0f183546..acf8cc4944d9 100644 --- a/core/proto/android/providers/settings/secure.proto +++ b/core/proto/android/providers/settings/secure.proto @@ -180,6 +180,7 @@ message SecureSettingsProto { optional SettingProto cmas_additional_broadcast_pkg = 14 [ (android.privacy).dest = DEST_AUTOMATIC ]; repeated SettingProto completed_categories = 15; optional SettingProto connectivity_release_pending_intent_delay_ms = 16 [ (android.privacy).dest = DEST_AUTOMATIC ]; + optional SettingProto adaptive_connectivity_enabled = 84 [ (android.privacy).dest = DEST_AUTOMATIC ]; message Controls { option (android.msg_privacy).dest = DEST_EXPLICIT; @@ -595,5 +596,5 @@ message SecureSettingsProto { // Please insert fields in alphabetical order and group them into messages // if possible (to avoid reaching the method limit). - // Next tag = 82; + // Next tag = 85; } |