diff options
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/src/OWNERS | 1 | ||||
| -rw-r--r-- | proto/src/am_capabilities.proto | 12 | ||||
| -rw-r--r-- | proto/src/camera.proto | 2 | ||||
| -rw-r--r-- | proto/src/metrics_constants/metrics_constants.proto | 3 | ||||
| -rw-r--r-- | proto/src/system_messages.proto | 14 |
5 files changed, 30 insertions, 2 deletions
diff --git a/proto/src/OWNERS b/proto/src/OWNERS index ccff6245ff2c..4d898b41e2a7 100644 --- a/proto/src/OWNERS +++ b/proto/src/OWNERS @@ -3,3 +3,4 @@ per-file wifi.proto = file:/wifi/OWNERS per-file camera.proto = file:/services/core/java/com/android/server/camera/OWNERS per-file system_messages.proto = file:/core/res/OWNERS per-file altitude.proto = file:/location/OWNERS +per-file am_capabilities.proto = rpaquay@google.com, sanglardf@google.com diff --git a/proto/src/am_capabilities.proto b/proto/src/am_capabilities.proto new file mode 100644 index 000000000000..d97bf816b150 --- /dev/null +++ b/proto/src/am_capabilities.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +package com.android.server.am; +option java_multiple_files = true; + +message Capability { + string name = 1; +} + +message Capabilities { + repeated Capability values = 1; +} diff --git a/proto/src/camera.proto b/proto/src/camera.proto index 38d74e4a73ce..205e806f534d 100644 --- a/proto/src/camera.proto +++ b/proto/src/camera.proto @@ -67,4 +67,6 @@ message CameraStreamProto { optional int64 dynamic_range_profile = 14; // The stream use case optional int64 stream_use_case = 15; + // The color space of the stream + optional int32 color_space = 16; } diff --git a/proto/src/metrics_constants/metrics_constants.proto b/proto/src/metrics_constants/metrics_constants.proto index 3801c2473c11..ced97cc0b39e 100644 --- a/proto/src/metrics_constants/metrics_constants.proto +++ b/proto/src/metrics_constants/metrics_constants.proto @@ -2794,8 +2794,9 @@ message MetricsEvent { // OPEN: Settings > User > Confirm remove dialog DIALOG_USER_REMOVE = 591; + // DEPRECATED: Feature has been moved and dialog is no longer shown // OPEN: Settings > User > Enable calling dialog - DIALOG_USER_ENABLE_CALLING = 592; + DIALOG_USER_ENABLE_CALLING = 592 [deprecated=true]; // OPEN: Settings > User > Enable calling and sms dialog DIALOG_USER_ENABLE_CALLING_AND_SMS = 593; diff --git a/proto/src/system_messages.proto b/proto/src/system_messages.proto index a94bfe281be1..21d09792f1c7 100644 --- a/proto/src/system_messages.proto +++ b/proto/src/system_messages.proto @@ -61,7 +61,7 @@ message SystemMessage { // Notify the user that they should select an input method // Package: android - NOTE_SELECT_INPUT_METHOD = 8; + NOTE_SELECT_INPUT_METHOD = 8 [deprecated = true]; // Notify the user about limited functionality before decryption // Package: android @@ -306,6 +306,10 @@ message SystemMessage { // Package: android NOTE_BT_APM_NOTIFICATION = 74; + // Inform that USB is configured as a Universal Video Class gadget + // Package: android + NOTE_USB_UVC = 75; + // ADD_NEW_IDS_ABOVE_THIS_LINE // Legacy IDs with arbitrary values appear below // Legacy IDs existed as stable non-conflicting constants prior to the O release @@ -392,5 +396,13 @@ message SystemMessage { // Note: this is a base ID, multiple notifications will be posted for each // abusive apps, with notification ID based off this ID. NOTE_ABUSIVE_BG_APPS_BASE = 0xc1b2508; // 203105544 + + // Notify the user that dialer and sms functionality are unavailable whilst the apps are + // paused in the work profile. + // Package: android + NOTE_ALL_MANAGED_SUBSCRIPTIONS_AND_MANAGED_PROFILE_OFF = 1006; + + // Notify the user that audio was lowered based on Calculated Sound Dose (CSD) + NOTE_CSD_LOWER_AUDIO = 1007; } } |