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

Merge "Convert proto3 to proto2 to avoid forced zero enum value."

Browse Source
This commit is contained in:
Yi Jin
2017-10-16 21:26:25 +00:00
committed by Android (Google) Code Review
parent 22910ada9a c7f93070b6
commit 0751b7249c
43 changed files with 1374 additions and 1420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/proto/android/app/notification_channel.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_package = "android.app";
option java_multiple_files = true;
@@ -27,28 +26,28 @@ import "frameworks/base/core/proto/android/media/audioattributes.proto";
* An android.app.NotificationChannel object.
*/
message NotificationChannelProto {
string id = 1;
string name = 2;
string description = 3;
int32 importance = 4;
bool can_bypass_dnd = 5;
optional string id = 1;
optional string name = 2;
optional string description = 3;
optional int32 importance = 4;
optional bool can_bypass_dnd = 5;
// Default is VISIBILITY_NO_OVERRIDE (-1000).
int32 lockscreen_visibility = 6;
string sound = 7;
bool use_lights = 8;
optional int32 lockscreen_visibility = 6;
optional string sound = 7;
optional bool use_lights = 8;
// Default is 0.
int32 light_color = 9;
optional int32 light_color = 9;
repeated int64 vibration = 10;
// Bitwise representation of fields that have been changed by the user,
// preventing the app from making changes to these fields.
int32 user_locked_fields = 11;
bool is_vibration_enabled = 12;
optional int32 user_locked_fields = 11;
optional bool is_vibration_enabled = 12;
// Default is true.
bool show_badge = 13;
optional bool show_badge = 13;
// Default is false.
bool is_deleted = 14;
string group = 15;
android.media.AudioAttributesProto audio_attributes = 16;
optional bool is_deleted = 14;
optional string group = 15;
optional android.media.AudioAttributesProto audio_attributes = 16;
// If this is a blockable system notification channel.
bool is_blockable_system = 17;
optional bool is_blockable_system = 17;
}

11
core/proto/android/app/notification_channel_group.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_package = "android.app";
option java_multiple_files = true;
@@ -27,9 +26,9 @@ import "frameworks/base/core/proto/android/app/notification_channel.proto";
* An android.app.NotificationChannelGroup object.
*/
message NotificationChannelGroupProto {
string id = 1;
string name = 2;
string description = 3;
bool is_blocked = 4;
optional string id = 1;
optional string name = 2;
optional string description = 3;
optional bool is_blocked = 4;
repeated android.app.NotificationChannelProto channels = 5;
}

7
core/proto/android/app/notificationmanager.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_package = "android.app";
option java_multiple_files = true;
@@ -48,8 +47,8 @@ message PolicyProto {
// Only starred contacts are prioritized.
STARRED = 2;
}
Sender priority_call_sender = 2;
Sender priority_message_sender = 3;
optional Sender priority_call_sender = 2;
optional Sender priority_message_sender = 3;
enum SuppressedVisualEffect {
SVE_UNKNOWN = 0;

9
core/proto/android/app/window_configuration.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_package = "android.app";
option java_multiple_files = true;
@@ -25,7 +24,7 @@ import "frameworks/base/core/proto/android/graphics/rect.proto";
/** Proto representation for WindowConfiguration.java class. */
message WindowConfigurationProto {
.android.graphics.RectProto app_bounds = 1;
int32 windowing_mode = 2;
int32 activity_type = 3;
optional .android.graphics.RectProto app_bounds = 1;
optional int32 windowing_mode = 2;
optional int32 activity_type = 3;
}

7
core/proto/android/content/component_name.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_package = "android.content";
option java_multiple_files = true;
@@ -25,7 +24,7 @@ package android.content;
* An android.content.ComponentName object.
*/
message ComponentNameProto {
string package_name = 1;
string class_name = 2;
optional string package_name = 1;
optional string class_name = 2;
}

35
core/proto/android/content/configuration.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_package = "android.content";
option java_multiple_files = true;
@@ -28,22 +27,22 @@ import "frameworks/base/core/proto/android/content/locale.proto";
* An android resource configuration.
*/
message ConfigurationProto {
float font_scale = 1;
uint32 mcc = 2;
uint32 mnc = 3;
optional float font_scale = 1;
optional uint32 mcc = 2;
optional uint32 mnc = 3;
repeated LocaleProto locales = 4;
uint32 screen_layout = 5;
uint32 touchscreen = 6;
uint32 keyboard_hidden = 7;
uint32 hard_keyboard_hidden = 8;
uint32 navigation = 9;
uint32 navigation_hidden = 10;
uint32 orientation = 11;
uint32 ui_mode = 12;
uint32 screen_width_dp = 13;
uint32 screen_height_dp = 14;
uint32 smallest_screen_width_dp = 15;
uint32 density_dpi = 16;
.android.app.WindowConfigurationProto window_configuration = 17;
optional uint32 screen_layout = 5;
optional uint32 touchscreen = 6;
optional uint32 keyboard_hidden = 7;
optional uint32 hard_keyboard_hidden = 8;
optional uint32 navigation = 9;
optional uint32 navigation_hidden = 10;
optional uint32 orientation = 11;
optional uint32 ui_mode = 12;
optional uint32 screen_width_dp = 13;
optional uint32 screen_height_dp = 14;
optional uint32 smallest_screen_width_dp = 15;
optional uint32 density_dpi = 16;
optional .android.app.WindowConfigurationProto window_configuration = 17;
}

37
core/proto/android/content/intent.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_package = "android.content";
option java_multiple_files = true;
@@ -25,18 +24,18 @@ package android.content;
// Next Tag: 13
message IntentProto {
string action = 1;
optional string action = 1;
repeated string categories = 2;
string data = 3;
string type = 4;
string flag = 5;
string package = 6;
string component = 7;
string source_bounds = 8;
string clip_data = 9;
string extras = 10;
int32 content_user_hint = 11;
string selector = 12;
optional string data = 3;
optional string type = 4;
optional string flag = 5;
optional string package = 6;
optional string component = 7;
optional string source_bounds = 8;
optional string clip_data = 9;
optional string extras = 10;
optional int32 content_user_hint = 11;
optional string selector = 12;
}
// Next Tag: 11
@@ -48,13 +47,13 @@ message IntentFilterProto {
repeated AuthorityEntryProto data_authorities = 5;
repeated android.os.PatternMatcherProto data_paths = 6;
repeated string data_types = 7;
int32 priority = 8;
bool has_partial_types = 9;
bool get_auto_verify = 10;
optional int32 priority = 8;
optional bool has_partial_types = 9;
optional bool get_auto_verify = 10;
}
message AuthorityEntryProto {
string host = 1;
bool wild = 2;
int32 port = 3;
optional string host = 1;
optional bool wild = 2;
optional int32 port = 3;
}

9
core/proto/android/content/locale.proto
View File

@@ -14,16 +14,15 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_package = "android.content";
option java_multiple_files = true;
package android.content;
message LocaleProto {
string language = 1;
string country = 2;
string variant = 3;
optional string language = 1;
optional string country = 2;
optional string variant = 3;
}

11
core/proto/android/graphics/rect.proto
View File

@@ -14,16 +14,15 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.graphics;
option java_multiple_files = true;
message RectProto {
int32 left = 1;
int32 top = 2;
int32 right = 3;
int32 bottom = 4;
optional int32 left = 1;
optional int32 top = 2;
optional int32 right = 3;
optional int32 bottom = 4;
}

9
core/proto/android/media/audioattributes.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_package = "android.media";
option java_multiple_files = true;
@@ -25,10 +24,10 @@ package android.media;
* An android.media.AudioAttributes object.
*/
message AudioAttributesProto {
Usage usage = 1;
ContentType content_type = 2;
optional Usage usage = 1;
optional ContentType content_type = 2;
// Bit representation of set flags.
int32 flags = 3;
optional int32 flags = 3;
repeated string tags = 4;
}

227
core/proto/android/os/batterystats.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_multiple_files = true;
package android.os;
@@ -23,13 +22,13 @@ package android.os;
import "frameworks/base/core/proto/android/telephony/signalstrength.proto";
message BatteryStatsProto {
int32 report_version = 1;
int64 parcel_version = 2;
string start_platform_version = 3;
string end_platform_version = 4;
BatteryHistoryProto history = 5;
optional int32 report_version = 1;
optional int64 parcel_version = 2;
optional string start_platform_version = 3;
optional string end_platform_version = 4;
optional BatteryHistoryProto history = 5;
repeated UidProto uids = 6;
SystemProto system = 7;
optional SystemProto system = 7;
}
message BatteryHistoryProto {
@@ -37,21 +36,21 @@ message BatteryHistoryProto {
message ControllerActivityProto {
// Time (milliseconds) spent in the idle state.
int64 idle_duration_ms = 1;
optional int64 idle_duration_ms = 1;
// Time (milliseconds) spent in the receive state.
int64 rx_duration_ms = 2;
optional int64 rx_duration_ms = 2;
// Total power (mAh) consumed by the controller in all states. The value may
// always be 0 if the device doesn't support power calculations.
int64 power_mah = 3;
optional int64 power_mah = 3;
// Represents a transmit level, where each level may draw a different amount
// of power. The levels themselves are controller-specific (and may possibly
// be device specific...yet to be confirmed).
message TxLevel {
// Transmit level. Higher levels draw more power.
int32 level = 1;
optional int32 level = 1;
// Time spent in this specific transmit level state.
int64 duration_ms = 2;
optional int64 duration_ms = 2;
}
repeated TxLevel tx = 4;
}
@@ -62,65 +61,65 @@ message SystemProto {
// In case of device time manually reset by users:
// start_clock_time_ms keeps the same value in the current collection
// period and changes for later collection periods.
int64 start_clock_time_ms = 1;
optional int64 start_clock_time_ms = 1;
// #times the device has been started since start_clock_time_millis.
int64 start_count = 2;
optional int64 start_count = 2;
// Total realtime duration (= SINCE_UNPLUGGED battery_realtime_millis.)
int64 total_realtime_ms = 3;
int64 total_uptime_ms = 4;
optional int64 total_realtime_ms = 3;
optional int64 total_uptime_ms = 4;
// Realtime duration on battery.
int64 battery_realtime_ms = 5;
optional int64 battery_realtime_ms = 5;
// Uptime duration (i.e., not suspend).
// Uptime is anytime the CPUs were on. The radio and Wifi chip
// can be running while the CPUs are off.
int64 battery_uptime_ms = 6;
optional int64 battery_uptime_ms = 6;
// Total realtime duration measured with screen off or dozing.
int64 screen_off_realtime_ms = 7;
optional int64 screen_off_realtime_ms = 7;
// Total uptime duration measured with screen off or dozing.
int64 screen_off_uptime_ms = 8;
optional int64 screen_off_uptime_ms = 8;
// Total time the screen was dozing while the device was running on battery.
// For historical reasons, screen_doze_duration_msec is a subset of
// screen_off_realtime_msec.
int64 screen_doze_duration_ms = 9;
optional int64 screen_doze_duration_ms = 9;
// The estimated real battery capacity, which may be less than the declared
// battery capacity (for example, because of battery aging). This field is
// less reliable than min(max)_learned_battery_capacity_uah, use those two
// fields whenever possible.
int64 estimated_battery_capacity_mah = 10;
optional int64 estimated_battery_capacity_mah = 10;
// The minimum learned battery capacity in uAh.
int64 min_learned_battery_capacity_uah = 11;
optional int64 min_learned_battery_capacity_uah = 11;
// The maximum learned battery capacity in uAh.
int64 max_learned_battery_capacity_uah = 12;
optional int64 max_learned_battery_capacity_uah = 12;
};
Battery battery = 1;
optional Battery battery = 1;
message BatteryDischarge {
// Discharged battery percentage points since the stats were last reset
// after charging (lower bound approximation).
int32 lower_bound_since_charge = 1;
optional int32 lower_bound_since_charge = 1;
// Upper bound approximation.
int32 upper_bound_since_charge = 2;
optional int32 upper_bound_since_charge = 2;
// Discharged points while screen is on.
int32 screen_on_since_charge = 3;
optional int32 screen_on_since_charge = 3;
// Discharged points while screen is off.
int32 screen_off_since_charge = 4;
optional int32 screen_off_since_charge = 4;
// Discharged points while screen was dozing. For historical reasons,
// screen_doze_since_charge is a subset of screen_off_since_charge.
int32 screen_doze_since_charge = 5;
optional int32 screen_doze_since_charge = 5;
// Total amount of battery discharged in mAh. This will only be non-zero for
// devices that report battery discharge via a coulomb counter.
int64 total_mah = 6;
optional int64 total_mah = 6;
// Total amount of battery discharged while the screen was off in mAh.
// This will only be non-zero for devices that report battery discharge
// via a coulomb counter.
int64 total_mah_screen_off = 7;
optional int64 total_mah_screen_off = 7;
// Total amount of battery discharged while the screen was dozing in mAh.
// This will only be non-zero for devices that report battery discharge
// via a coulomb counter. For historical reasons, total_mah_screen_doze is
// a subset of total_mah_screen_off.
int64 total_mah_screen_doze = 8;
optional int64 total_mah_screen_doze = 8;
};
BatteryDischarge battery_discharge = 2;
optional BatteryDischarge battery_discharge = 2;
oneof time_remaining {
// Approximation for how much time remains until the battery is fully
@@ -138,9 +137,9 @@ message SystemProto {
// for the entire duration should be marked MIXED.
message BatteryLevelStep {
// How long the battery was at the current level.
int64 duration_ms = 1;
optional int64 duration_ms = 1;
// Battery level
int32 level = 2;
optional int32 level = 2;
// State of the display. A special enum is used rather than
// DisplayProto.State because a MIXED value needs to be in the enum, and
@@ -156,7 +155,7 @@ message SystemProto {
}
// The state of the display for the entire battery level step. MIXED is used
// if there were multiple states for this step.
DisplayState display_state = 3;
optional DisplayState display_state = 3;
// Indicates status in power save mode.
enum PowerSaveMode {
@@ -166,7 +165,7 @@ message SystemProto {
}
// Battery Saver mode for the entire battery level step. MIXED is used
// if there were multiple states for this step.
PowerSaveMode power_save_mode = 4;
optional PowerSaveMode power_save_mode = 4;
// Indicates status in idle mode.
enum IdleMode {
@@ -176,7 +175,7 @@ message SystemProto {
}
// Doze mode for the entire battery level step. MIXED is used if there were
// multiple states for this step.
IdleMode idle_mode = 5;
optional IdleMode idle_mode = 5;
};
// Battery level steps when the device was charging.
repeated BatteryLevelStep charge_step = 5;
@@ -206,109 +205,109 @@ message SystemProto {
HSPAP = 15;
OTHER = 16;
};
Name name = 1;
TimerProto total = 2;
optional Name name = 1;
optional TimerProto total = 2;
};
repeated DataConnection data_connection = 8;
ControllerActivityProto global_bluetooth_controller = 9;
ControllerActivityProto global_modem_controller = 10;
ControllerActivityProto global_wifi_controller = 11;
optional ControllerActivityProto global_bluetooth_controller = 9;
optional ControllerActivityProto global_modem_controller = 10;
optional ControllerActivityProto global_wifi_controller = 11;
message GlobalNetwork {
// Total Bytes received on mobile connections.
int64 mobile_bytes_rx = 1;
optional int64 mobile_bytes_rx = 1;
// Total Bytes transmitted on mobile connections.
int64 mobile_bytes_tx = 2;
optional int64 mobile_bytes_tx = 2;
// Total Bytes received on wifi connections.
int64 wifi_bytes_rx = 3;
optional int64 wifi_bytes_rx = 3;
// Total Bytes transmitted on wifi connections.
int64 wifi_bytes_tx = 4;
optional int64 wifi_bytes_tx = 4;
// Total Packets received on mobile connections.
int64 mobile_packets_rx = 5;
optional int64 mobile_packets_rx = 5;
// Total Packets transmitted on mobile connections.
int64 mobile_packets_tx = 6;
optional int64 mobile_packets_tx = 6;
// Total Packets received on wifi connections.
int64 wifi_packets_rx = 7;
optional int64 wifi_packets_rx = 7;
// Total Packets transmitted on wifi connections.
int64 wifi_packets_tx = 8;
optional int64 wifi_packets_tx = 8;
// Total Bytes received on bluetooth connections.
int64 bt_bytes_rx = 9;
optional int64 bt_bytes_rx = 9;
// Total Bytes transmitted on bluetooth connections.
int64 bt_bytes_tx = 10;
optional int64 bt_bytes_tx = 10;
};
GlobalNetwork global_network = 12;
optional GlobalNetwork global_network = 12;
message GlobalWifi {
// The amount of time that wifi has been on while the device was running on
// battery.
int64 on_duration_ms = 1;
optional int64 on_duration_ms = 1;
// The amount of time that wifi has been on and the driver has been in the
// running state while the device was running on battery.
int64 running_duration_ms = 2;
optional int64 running_duration_ms = 2;
}
GlobalWifi global_wifi = 13;
optional GlobalWifi global_wifi = 13;
// Kernel wakelock metrics are only recorded when the device is unplugged
// *and* the screen is off.
message KernelWakelock {
string name = 1;
optional string name = 1;
// Kernel wakelock stats aren't apportioned across all kernel wakelocks (as
// app wakelocks stats are).
TimerProto total = 2;
optional TimerProto total = 2;
// The kernel doesn't have the data to enable printing out current and max
// durations.
};
repeated KernelWakelock kernel_wakelock = 14;
message Misc {
int64 screen_on_duration_ms = 1;
int64 phone_on_duration_ms = 2;
int64 full_wakelock_total_duration_ms = 3;
optional int64 screen_on_duration_ms = 1;
optional int64 phone_on_duration_ms = 2;
optional int64 full_wakelock_total_duration_ms = 3;
// The total elapsed time that a partial wakelock was held. This duration
// does not double count wakelocks held at the same time.
int64 partial_wakelock_total_duration_ms = 4;
int64 mobile_radio_active_duration_ms = 5;
optional int64 partial_wakelock_total_duration_ms = 4;
optional int64 mobile_radio_active_duration_ms = 5;
// The time that is the difference between the mobile radio time we saw
// based on the elapsed timestamp when going down vs. the given time stamp
// from the radio.
int64 mobile_radio_active_adjusted_time_ms = 6;
int32 mobile_radio_active_count = 7;
optional int64 mobile_radio_active_adjusted_time_ms = 6;
optional int32 mobile_radio_active_count = 7;
// The amount of time that the mobile network has been active (in a high
// power state) but not being able to blame on an app.
int32 mobile_radio_active_unknown_duration_ms = 8;
optional int32 mobile_radio_active_unknown_duration_ms = 8;
// Total amount of time the device was in the interactive state.
int64 interactive_duration_ms = 9;
int64 battery_saver_mode_enabled_duration_ms = 10;
int32 num_connectivity_changes = 11;
optional int64 interactive_duration_ms = 9;
optional int64 battery_saver_mode_enabled_duration_ms = 10;
optional int32 num_connectivity_changes = 11;
// Amount of time the device was in deep Doze.
int64 deep_doze_enabled_duration_ms = 12;
optional int64 deep_doze_enabled_duration_ms = 12;
// How many times the device went into deep Doze mode.
int32 deep_doze_count = 13;
optional int32 deep_doze_count = 13;
// Amount of time the device was idling in deep Doze. Idling time
// encompasses "doze" time and the maintenance windows that allow apps to
// operate.
int64 deep_doze_idling_duration_ms = 14;
optional int64 deep_doze_idling_duration_ms = 14;
// How many times the device idling for deep Doze mode.
int32 deep_doze_idling_count = 15;
int64 longest_deep_doze_duration_ms = 16;
optional int32 deep_doze_idling_count = 15;
optional int64 longest_deep_doze_duration_ms = 16;
// Amount of time the device was in Doze Light.
int64 light_doze_enabled_duration_ms = 17;
optional int64 light_doze_enabled_duration_ms = 17;
// How many times the device went into Doze Light mode.
int32 light_doze_count = 18;
optional int32 light_doze_count = 18;
// Amount of time the device was idling in Doze Light. Idling time
// encompasses "doze" time and the maintenance windows that allow apps to
// operate.
int64 light_doze_idling_duration_ms = 19;
optional int64 light_doze_idling_duration_ms = 19;
// How many times the device idling for Doze Light mode.
int32 light_doze_idling_count = 20;
int64 longest_light_doze_duration_ms = 21;
optional int32 light_doze_idling_count = 20;
optional int64 longest_light_doze_duration_ms = 21;
}
Misc misc = 15;
optional Misc misc = 15;
message PhoneSignalStrength {
android.telephony.SignalStrengthProto.StrengthName name = 1;
TimerProto total = 2;
optional android.telephony.SignalStrengthProto.StrengthName name = 1;
optional TimerProto total = 2;
};
repeated PhoneSignalStrength phone_signal_strength = 16;
@@ -328,40 +327,40 @@ message SystemProto {
CAMERA = 11;
MEMORY = 12;
};
Sipper name = 1;
optional Sipper name = 1;
// UID, only valid for the USER sipper.
int32 uid = 2;
optional int32 uid = 2;
// Estimated power use in mAh.
double computed_power_mah = 3;
optional double computed_power_mah = 3;
// Starting in Oreo, Battery Settings has two modes to display the battery
// info. The first is "app usage list". In this mode, items with should_hide
// enabled are hidden.
bool should_hide = 4;
optional bool should_hide = 4;
// Smeared power from screen usage. Screen usage power is split and smeared
// among apps, based on activity time.
double screen_power_mah = 5;
optional double screen_power_mah = 5;
// Smeared power using proportional method. Power usage from hidden sippers
// is smeared to all apps proportionally (except for screen usage).
double proportional_smear_mah = 6;
optional double proportional_smear_mah = 6;
};
repeated PowerUseItem power_use_item = 17;
message PowerUseSummary {
double battery_capacity_mah = 1;
double computed_power_mah = 2;
optional double battery_capacity_mah = 1;
optional double computed_power_mah = 2;
// Lower bound of actual power drained.
double min_drained_power_mah = 3;
optional double min_drained_power_mah = 3;
// Upper bound of actual power drained.
double max_drained_power_mah = 4;
optional double max_drained_power_mah = 4;
};
PowerUseSummary power_use_summary = 18;
optional PowerUseSummary power_use_summary = 18;
message ResourcePowerManager {
string name = 1;
TimerProto total = 2;
TimerProto screen_off = 3;
optional string name = 1;
optional TimerProto total = 2;
optional TimerProto screen_off = 3;
}
ResourcePowerManager resource_power_manager = 19;
optional ResourcePowerManager resource_power_manager = 19;
message ScreenBrightness {
enum Name {
@@ -371,17 +370,17 @@ message SystemProto {
LIGHT = 3;
BRIGHT = 4;
};
Name name = 1;
TimerProto total = 2;
optional Name name = 1;
optional TimerProto total = 2;
};
repeated ScreenBrightness screen_brightness = 20;
// Duration and number of times trying to acquire a signal
TimerProto signal_scanning = 21;
optional TimerProto signal_scanning = 21;
message WakeupReason {
string name = 1;
TimerProto total = 2;
optional string name = 1;
optional TimerProto total = 2;
};
repeated WakeupReason wakeup_reason = 22;
@@ -393,8 +392,8 @@ message SystemProto {
GOOD = 3;
GREAT = 4;
};
Name name = 1;
TimerProto total = 2;
optional Name name = 1;
optional TimerProto total = 2;
};
repeated WifiSignalStrength wifi_signal_strength = 23;
@@ -409,8 +408,8 @@ message SystemProto {
ON_CONNECTED_STA_P2P = 6;
SOFT_AP = 7;
};
Name name = 1;
TimerProto total = 2;
optional Name name = 1;
optional TimerProto total = 2;
};
repeated WifiState wifi_state = 24;
@@ -430,19 +429,19 @@ message SystemProto {
DORMANT = 11;
UNINITIALIZED = 12;
};
Name name = 1;
TimerProto total = 2;
optional Name name = 1;
optional TimerProto total = 2;
};
repeated WifiSupplicantState wifi_supplicant_state = 25;
}
message TimerProto {
int64 duration_ms = 1;
int64 count = 2;
optional int64 duration_ms = 1;
optional int64 count = 2;
}
message UidProto {
// Combination of app ID and user ID.
int32 uid = 1;
optional int32 uid = 1;
repeated string package_names = 2;
}

41
core/proto/android/os/incident.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_multiple_files = true;
option java_outer_classname = "IncidentProtoMetadata";
@@ -52,74 +51,74 @@ message IncidentProto {
//SystemProperties system_properties = 1000;
// Linux services
Procrank procrank = 2000 [
optional Procrank procrank = 2000 [
(section).type = SECTION_COMMAND,
(section).args = "/system/xbin/procrank"
];
PageTypeInfo page_type_info = 2001 [
optional PageTypeInfo page_type_info = 2001 [
(section).type = SECTION_FILE,
(section).args = "/proc/pagetypeinfo"
];
KernelWakeSources kernel_wake_sources = 2002 [
optional KernelWakeSources kernel_wake_sources = 2002 [
(section).type = SECTION_FILE,
(section).args = "/d/wakeup_sources"
];
// System Services
android.service.fingerprint.FingerprintServiceDumpProto fingerprint = 3000 [
optional android.service.fingerprint.FingerprintServiceDumpProto fingerprint = 3000 [
(section).type = SECTION_DUMPSYS,
(section).args = "fingerprint --proto --incident"
];
android.service.NetworkStatsServiceDumpProto netstats = 3001 [
optional android.service.NetworkStatsServiceDumpProto netstats = 3001 [
(section).type = SECTION_DUMPSYS,
(section).args = "netstats --proto"
];
android.providers.settings.SettingsServiceDumpProto settings = 3002;
android.service.appwidget.AppWidgetServiceDumpProto appwidget = 3003;
android.service.notification.NotificationServiceDumpProto notification = 3004 [
optional android.providers.settings.SettingsServiceDumpProto settings = 3002;
optional android.service.appwidget.AppWidgetServiceDumpProto appwidget = 3003;
optional android.service.notification.NotificationServiceDumpProto notification = 3004 [
(section).type = SECTION_DUMPSYS,
(section).args = "notification --proto"
];
android.service.batterystats.BatteryStatsServiceDumpProto batterystats = 3005 [
optional android.service.batterystats.BatteryStatsServiceDumpProto batterystats = 3005 [
(section).type = SECTION_DUMPSYS,
(section).args = "batterystats --proto"
];
android.service.battery.BatteryServiceDumpProto battery = 3006 [
optional android.service.battery.BatteryServiceDumpProto battery = 3006 [
(section).type = SECTION_DUMPSYS,
(section).args = "battery --proto"
];
android.service.diskstats.DiskStatsServiceDumpProto diskstats = 3007 [
optional android.service.diskstats.DiskStatsServiceDumpProto diskstats = 3007 [
(section).type = SECTION_DUMPSYS,
(section).args = "diskstats --proto"
];
android.service.pm.PackageServiceDumpProto package = 3008;
android.service.power.PowerServiceDumpProto power = 3009;
android.service.print.PrintServiceDumpProto print = 3010;
optional android.service.pm.PackageServiceDumpProto package = 3008;
optional android.service.power.PowerServiceDumpProto power = 3009;
optional android.service.print.PrintServiceDumpProto print = 3010;
android.service.procstats.ProcessStatsServiceDumpProto procstats = 3011 [
optional android.service.procstats.ProcessStatsServiceDumpProto procstats = 3011 [
(section).type = SECTION_DUMPSYS,
(section).args = "procstats --proto"
];
com.android.server.am.proto.ActivityStackSupervisorProto activities = 3012 [
optional com.android.server.am.proto.ActivityStackSupervisorProto activities = 3012 [
(section).type = SECTION_DUMPSYS,
(section).args = "activity --proto activities"
];
com.android.server.am.proto.BroadcastProto broadcasts = 3013 [
optional com.android.server.am.proto.BroadcastProto broadcasts = 3013 [
(section).type = SECTION_DUMPSYS,
(section).args = "activity --proto broadcasts"
];
com.android.server.am.proto.ServiceProto amservices = 3014;
com.android.server.am.proto.ProcessProto amprocesses = 3015;
optional com.android.server.am.proto.ServiceProto amservices = 3014;
optional com.android.server.am.proto.ProcessProto amprocesses = 3015;
}

5
core/proto/android/os/incidentheader.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_multiple_files = true;
option java_outer_classname = "IncidentHeaderProtoMetadata";
@@ -29,6 +28,6 @@ message IncidentHeaderProto {
CAUSE_CRASH = 3;
}
Cause cause = 1;
optional Cause cause = 1;
}

23
core/proto/android/os/kernelwake.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_multiple_files = true;
option java_outer_classname = "WakeupSourcesProto";
@@ -29,23 +28,23 @@ message KernelWakeSources {
// Next Tag: 11
message WakeupSourceProto {
// Name of the event which triggers application processor
string name = 1;
optional string name = 1;
int32 active_count = 2;
optional int32 active_count = 2;
int32 event_count = 3;
optional int32 event_count = 3;
int32 wakeup_count = 4;
optional int32 wakeup_count = 4;
int32 expire_count = 5;
optional int32 expire_count = 5;
int64 active_since = 6;
optional int64 active_since = 6;
int64 total_time = 7;
optional int64 total_time = 7;
int64 max_time = 8;
optional int64 max_time = 8;
int64 last_change = 9;
optional int64 last_change = 9;
int64 prevent_suspend_time = 10;
optional int64 prevent_suspend_time = 10;
}

11
core/proto/android/os/looper.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.os;
option java_multiple_files = true;
@@ -23,8 +22,8 @@ option java_multiple_files = true;
import "frameworks/base/core/proto/android/os/messagequeue.proto";
message LooperProto {
string thread_name = 1;
int64 thread_id = 2;
int32 identity_hash_code = 3;
android.os.MessageQueueProto queue = 4;
optional string thread_name = 1;
optional int64 thread_id = 2;
optional int32 identity_hash_code = 3;
optional android.os.MessageQueueProto queue = 4;
}

19
core/proto/android/os/message.proto
View File

@@ -14,24 +14,23 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.os;
option java_multiple_files = true;
message MessageProto {
int64 when = 1;
optional int64 when = 1;
// Name of callback class.
string callback = 2;
optional string callback = 2;
// User-defined message code so that the recipient can identify what this
// message is about.
int32 what = 3;
int32 arg1 = 4;
int32 arg2 = 5;
optional int32 what = 3;
optional int32 arg1 = 4;
optional int32 arg2 = 5;
// String representation of an arbitrary object to send to the recipient.
string obj = 6;
optional string obj = 6;
// Name of target class.
string target = 7;
int32 barrier = 8;
optional string target = 7;
optional int32 barrier = 8;
}

7
core/proto/android/os/messagequeue.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.os;
option java_multiple_files = true;
@@ -24,6 +23,6 @@ import "frameworks/base/core/proto/android/os/message.proto";
message MessageQueueProto {
repeated android.os.MessageProto messages = 1;
bool is_polling_locked = 2;
bool is_quitting = 3;
optional bool is_polling_locked = 2;
optional bool is_quitting = 3;
}

29
core/proto/android/os/pagetypeinfo.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_multiple_files = true;
option java_outer_classname = "PageTypeInfoProto";
@@ -38,9 +37,9 @@ package android.os;
*/
message PageTypeInfo {
int32 page_block_order = 1;
optional int32 page_block_order = 1;
int32 pages_per_block = 2;
optional int32 pages_per_block = 2;
repeated MigrateTypeProto migrate_types = 3;
@@ -50,11 +49,11 @@ message PageTypeInfo {
// Next tag: 5
message MigrateTypeProto {
int32 node = 1;
optional int32 node = 1;
string zone = 2;
optional string zone = 2;
string type = 3;
optional string type = 3;
// order level starts from 0 for 4KB to page_block_order defined above, e.g. 10 for 4096KB
repeated int32 free_pages_count = 4;
@@ -63,19 +62,19 @@ message MigrateTypeProto {
// Next tag: 9
message BlockProto {
int32 node = 1;
optional int32 node = 1;
string zone = 2;
optional string zone = 2;
int32 unmovable = 3;
optional int32 unmovable = 3;
int32 reclaimable = 4;
optional int32 reclaimable = 4;
int32 movable = 5;
optional int32 movable = 5;
int32 cma = 6;
optional int32 cma = 6;
int32 reserve = 7;
optional int32 reserve = 7;
int32 isolate = 8;
optional int32 isolate = 8;
}

7
core/proto/android/os/patternmatcher.proto
View File

@@ -14,14 +14,13 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_multiple_files = true;
package android.os;
message PatternMatcherProto {
string pattern = 1;
optional string pattern = 1;
enum Type {
TYPE_LITERAL = 0;
@@ -29,7 +28,7 @@ message PatternMatcherProto {
TYPE_SIMPLE_GLOB = 2;
TYPE_ADVANCED_GLOB = 3;
}
Type type = 2;
optional Type type = 2;
// This data is too much for dump
// repeated int32 parsed_pattern = 3;

35
core/proto/android/os/procrank.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_multiple_files = true;
option java_outer_classname = "ProcrankProto";
@@ -27,56 +26,56 @@ message Procrank {
repeated ProcessProto processes = 1;
// Summary
SummaryProto summary = 2;
optional SummaryProto summary = 2;
}
// Next Tag: 11
message ProcessProto {
// ID of the process
int32 pid = 1;
optional int32 pid = 1;
// virtual set size, unit KB
int64 vss = 2;
optional int64 vss = 2;
// resident set size, unit KB
int64 rss = 3;
optional int64 rss = 3;
// proportional set size, unit KB
int64 pss = 4;
optional int64 pss = 4;
// unique set size, unit KB
int64 uss = 5;
optional int64 uss = 5;
// swap size, unit KB
int64 swap = 6;
optional int64 swap = 6;
// proportional swap size, unit KB
int64 pswap = 7;
optional int64 pswap = 7;
// unique swap size, unit KB
int64 uswap = 8;
optional int64 uswap = 8;
// zswap size, unit KB
int64 zswap = 9;
optional int64 zswap = 9;
// process command
string cmdline = 10;
optional string cmdline = 10;
}
// Next Tag: 3
message SummaryProto {
ProcessProto total = 1;
optional ProcessProto total = 1;
ZramProto zram = 2;
optional ZramProto zram = 2;
RamProto ram = 3;
optional RamProto ram = 3;
}
// TODO: sync on how to use these values
message ZramProto {
string raw_text = 1;
optional string raw_text = 1;
}
message RamProto {
string raw_text = 1;
optional string raw_text = 1;
}

7
core/proto/android/os/worksource.proto
View File

@@ -14,16 +14,15 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.os;
option java_multiple_files = true;
message WorkSourceProto {
message WorkSourceContentProto {
int32 uid = 1;
string name = 2;
optional int32 uid = 1;
optional string name = 2;
}
repeated WorkSourceContentProto work_source_contents = 1;

1073
core/proto/android/providers/settings.proto
View File

File diff suppressed because it is too large Load Diff

139
core/proto/android/server/activitymanagerservice.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
import "frameworks/base/core/proto/android/content/intent.proto";
import "frameworks/base/core/proto/android/server/intentresolver.proto";
import "frameworks/base/core/proto/android/server/windowmanagerservice.proto";
@@ -27,140 +26,140 @@ package com.android.server.am.proto;
option java_multiple_files = true;
message ActivityManagerServiceProto {
ActivityStackSupervisorProto activities = 1;
optional ActivityStackSupervisorProto activities = 1;
BroadcastProto broadcasts = 2;
optional BroadcastProto broadcasts = 2;
ServiceProto services = 3;
optional ServiceProto services = 3;
ProcessProto processes = 4;
optional ProcessProto processes = 4;
}
message ActivityStackSupervisorProto {
.com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
repeated ActivityDisplayProto displays = 2;
KeyguardControllerProto keyguard_controller = 3;
int32 focused_stack_id = 4;
.com.android.server.wm.proto.IdentifierProto resumed_activity = 5;
optional KeyguardControllerProto keyguard_controller = 3;
optional int32 focused_stack_id = 4;
optional .com.android.server.wm.proto.IdentifierProto resumed_activity = 5;
}
/* represents ActivityStackSupervisor.ActivityDisplay */
message ActivityDisplayProto {
.com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
int32 id = 2;
optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
optional int32 id = 2;
repeated ActivityStackProto stacks = 3;
}
message ActivityStackProto {
.com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
int32 id = 2;
optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
optional int32 id = 2;
repeated TaskRecordProto tasks = 3;
.com.android.server.wm.proto.IdentifierProto resumed_activity = 4;
int32 display_id = 5;
bool fullscreen = 6;
.android.graphics.RectProto bounds = 7;
optional .com.android.server.wm.proto.IdentifierProto resumed_activity = 4;
optional int32 display_id = 5;
optional bool fullscreen = 6;
optional .android.graphics.RectProto bounds = 7;
}
message TaskRecordProto {
.com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
int32 id = 2;
optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
optional int32 id = 2;
repeated ActivityRecordProto activities = 3;
int32 stack_id = 4;
.android.graphics.RectProto last_non_fullscreen_bounds = 5;
string real_activity = 6;
string orig_activity = 7;
int32 activity_type = 8;
int32 return_to_type = 9;
int32 resize_mode = 10;
bool fullscreen = 11;
.android.graphics.RectProto bounds = 12;
int32 min_width = 13;
int32 min_height = 14;
optional int32 stack_id = 4;
optional .android.graphics.RectProto last_non_fullscreen_bounds = 5;
optional string real_activity = 6;
optional string orig_activity = 7;
optional int32 activity_type = 8;
optional int32 return_to_type = 9;
optional int32 resize_mode = 10;
optional bool fullscreen = 11;
optional .android.graphics.RectProto bounds = 12;
optional int32 min_width = 13;
optional int32 min_height = 14;
}
message ActivityRecordProto {
.com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
.com.android.server.wm.proto.IdentifierProto identifier = 2;
string state = 3;
bool visible = 4;
bool front_of_task = 5;
int32 proc_id = 6;
optional .com.android.server.wm.proto.ConfigurationContainerProto configuration_container = 1;
optional .com.android.server.wm.proto.IdentifierProto identifier = 2;
optional string state = 3;
optional bool visible = 4;
optional bool front_of_task = 5;
optional int32 proc_id = 6;
}
message KeyguardControllerProto {
bool keyguard_showing = 1;
bool keyguard_occluded = 2;
optional bool keyguard_showing = 1;
optional bool keyguard_occluded = 2;
}
message BroadcastProto {
repeated ReceiverListProto receiver_list = 1;
.com.android.server.IntentResolverProto receiver_resolver = 2;
optional .com.android.server.IntentResolverProto receiver_resolver = 2;
repeated BroadcastQueueProto broadcast_queue = 3;
repeated StickyBroadcastProto sticky_broadcasts = 4;
message MainHandler {
string handler = 1;
.android.os.LooperProto looper = 2;
optional string handler = 1;
optional .android.os.LooperProto looper = 2;
}
MainHandler handler = 5;
optional MainHandler handler = 5;
}
message ReceiverListProto {
ProcessRecordProto app = 1;
int32 pid = 2;
int32 uid = 3;
int32 user = 4;
BroadcastRecordProto current = 5;
bool linked_to_death = 6;
optional ProcessRecordProto app = 1;
optional int32 pid = 2;
optional int32 uid = 3;
optional int32 user = 4;
optional BroadcastRecordProto current = 5;
optional bool linked_to_death = 6;
repeated BroadcastFilterProto filters = 7;
string hex_hash = 8; // this hash is used to find the object in IntentResolver
optional string hex_hash = 8; // this hash is used to find the object in IntentResolver
}
message ProcessRecordProto {
int32 pid = 1;
string process_name = 2;
int32 uid = 3;
int32 user_id = 4;
int32 app_id = 5;
int32 isolated_app_id = 6;
optional int32 pid = 1;
optional string process_name = 2;
optional int32 uid = 3;
optional int32 user_id = 4;
optional int32 app_id = 5;
optional int32 isolated_app_id = 6;
}
message BroadcastRecordProto {
int32 user_id = 1;
string intent_action = 2;
optional int32 user_id = 1;
optional string intent_action = 2;
}
message BroadcastFilterProto {
.android.content.IntentFilterProto intent_filter = 1;
string required_permission = 2;
string hex_hash = 3; // used to find the object in IntentResolver
int32 owning_user_id = 4;
optional .android.content.IntentFilterProto intent_filter = 1;
optional string required_permission = 2;
optional string hex_hash = 3; // used to find the object in IntentResolver
optional int32 owning_user_id = 4;
}
message BroadcastQueueProto {
string queue_name = 1;
optional string queue_name = 1;
repeated BroadcastRecordProto parallel_broadcasts = 2;
repeated BroadcastRecordProto ordered_broadcasts = 3;
BroadcastRecordProto pending_broadcast = 4;
optional BroadcastRecordProto pending_broadcast = 4;
repeated BroadcastRecordProto historical_broadcasts = 5;
message BroadcastSummary {
.android.content.IntentProto intent = 1;
int64 enqueue_clock_time_ms = 2;
int64 dispatch_clock_time_ms = 3;
int64 finish_clock_time_ms = 4;
optional .android.content.IntentProto intent = 1;
optional int64 enqueue_clock_time_ms = 2;
optional int64 dispatch_clock_time_ms = 3;
optional int64 finish_clock_time_ms = 4;
}
repeated BroadcastSummary historical_broadcasts_summary = 6;
}
message StickyBroadcastProto {
int32 user = 1;
optional int32 user = 1;
message StickyAction {
string name = 1;
optional string name = 1;
repeated .android.content.IntentProto intents = 2;
}
repeated StickyAction actions = 2;

5
core/proto/android/server/intentresolver.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_multiple_files = true;
package com.android.server;
@@ -23,7 +22,7 @@ package com.android.server;
message IntentResolverProto {
message ArrayMapEntry {
string key = 1;
optional string key = 1;
repeated string values = 2;
}

135
core/proto/android/server/windowmanagerservice.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
import "frameworks/base/core/proto/android/content/configuration.proto";
import "frameworks/base/core/proto/android/graphics/rect.proto";
import "frameworks/base/core/proto/android/view/displayinfo.proto";
@@ -26,21 +25,21 @@ package com.android.server.wm.proto;
option java_multiple_files = true;
message WindowManagerServiceProto {
WindowManagerPolicyProto policy = 1;
optional WindowManagerPolicyProto policy = 1;
/* window hierarchy root */
RootWindowContainerProto root_window_container = 2;
IdentifierProto focused_window = 3;
string focused_app = 4;
IdentifierProto input_method_window = 5;
bool display_frozen = 6;
int32 rotation = 7;
int32 last_orientation = 8;
AppTransitionProto app_transition = 9;
optional RootWindowContainerProto root_window_container = 2;
optional IdentifierProto focused_window = 3;
optional string focused_app = 4;
optional IdentifierProto input_method_window = 5;
optional bool display_frozen = 6;
optional int32 rotation = 7;
optional int32 last_orientation = 8;
optional AppTransitionProto app_transition = 9;
}
/* represents DisplayContent */
message RootWindowContainerProto {
WindowContainerProto window_container = 1;
optional WindowContainerProto window_container = 1;
repeated DisplayProto displays = 2;
/* window references in top down z order */
repeated IdentifierProto windows = 3;
@@ -48,7 +47,7 @@ message RootWindowContainerProto {
/* represents PhoneWindowManager */
message WindowManagerPolicyProto {
.android.graphics.RectProto stable_bounds = 1;
optional .android.graphics.RectProto stable_bounds = 1;
}
/* represents AppTransition */
@@ -59,7 +58,7 @@ message AppTransitionProto {
APP_STATE_RUNNING = 2;
APP_STATE_TIMEOUT = 3;
}
AppState app_transition_state = 1;
optional AppState app_transition_state = 1;
/* definitions for constants found in {@link com.android.server.wm.AppTransition} */
enum TransitionType {
TRANSIT_NONE = 0;
@@ -83,124 +82,124 @@ message AppTransitionProto {
TRANSIT_KEYGUARD_OCCLUDE = 22;
TRANSIT_KEYGUARD_UNOCCLUDE = 23;
}
TransitionType last_used_app_transition = 2;
optional TransitionType last_used_app_transition = 2;
}
/* represents DisplayContent */
message DisplayProto {
WindowContainerProto window_container = 1;
int32 id = 2;
optional WindowContainerProto window_container = 1;
optional int32 id = 2;
repeated StackProto stacks = 3;
DockedStackDividerControllerProto docked_stack_divider_controller = 4;
PinnedStackControllerProto pinned_stack_controller = 5;
optional DockedStackDividerControllerProto docked_stack_divider_controller = 4;
optional PinnedStackControllerProto pinned_stack_controller = 5;
/* non app windows */
repeated WindowTokenProto above_app_windows = 6;
repeated WindowTokenProto below_app_windows = 7;
repeated WindowTokenProto ime_windows = 8;
int32 dpi = 9;
.android.view.DisplayInfoProto display_info = 10;
int32 rotation = 11;
ScreenRotationAnimationProto screen_rotation_animation = 12;
optional int32 dpi = 9;
optional .android.view.DisplayInfoProto display_info = 10;
optional int32 rotation = 11;
optional ScreenRotationAnimationProto screen_rotation_animation = 12;
}
/* represents DockedStackDividerController */
message DockedStackDividerControllerProto {
bool minimized_dock = 1;
optional bool minimized_dock = 1;
}
/* represents PinnedStackController */
message PinnedStackControllerProto {
.android.graphics.RectProto default_bounds = 1;
.android.graphics.RectProto movement_bounds = 2;
optional .android.graphics.RectProto default_bounds = 1;
optional .android.graphics.RectProto movement_bounds = 2;
}
/* represents TaskStack */
message StackProto {
WindowContainerProto window_container = 1;
int32 id = 2;
optional WindowContainerProto window_container = 1;
optional int32 id = 2;
repeated TaskProto tasks = 3;
bool fills_parent = 4;
.android.graphics.RectProto bounds = 5;
bool animation_background_surface_is_dimming = 6;
optional bool fills_parent = 4;
optional .android.graphics.RectProto bounds = 5;
optional bool animation_background_surface_is_dimming = 6;
}
/* represents Task */
message TaskProto {
WindowContainerProto window_container = 1;
int32 id = 2;
optional WindowContainerProto window_container = 1;
optional int32 id = 2;
repeated AppWindowTokenProto app_window_tokens = 3;
bool fills_parent = 4;
.android.graphics.RectProto bounds = 5;
.android.graphics.RectProto temp_inset_bounds = 6;
optional bool fills_parent = 4;
optional .android.graphics.RectProto bounds = 5;
optional .android.graphics.RectProto temp_inset_bounds = 6;
}
/* represents AppWindowToken */
message AppWindowTokenProto {
/* obtained from ActivityRecord */
string name = 1;
WindowTokenProto window_token = 2;
optional string name = 1;
optional WindowTokenProto window_token = 2;
}
/* represents WindowToken */
message WindowTokenProto {
WindowContainerProto window_container = 1;
int32 hash_code = 2;
optional WindowContainerProto window_container = 1;
optional int32 hash_code = 2;
repeated WindowStateProto windows = 3;
}
/* represents WindowState */
message WindowStateProto {
WindowContainerProto window_container = 1;
IdentifierProto identifier = 2;
int32 display_id = 3;
int32 stack_id = 4;
.android.view.WindowLayoutParamsProto attributes = 5;
.android.graphics.RectProto given_content_insets = 6;
.android.graphics.RectProto frame = 7;
.android.graphics.RectProto containing_frame = 8;
.android.graphics.RectProto parent_frame = 9;
.android.graphics.RectProto content_frame = 10;
.android.graphics.RectProto content_insets = 11;
.android.graphics.RectProto surface_insets = 12;
WindowStateAnimatorProto animator = 13;
bool animating_exit = 14;
optional WindowContainerProto window_container = 1;
optional IdentifierProto identifier = 2;
optional int32 display_id = 3;
optional int32 stack_id = 4;
optional .android.view.WindowLayoutParamsProto attributes = 5;
optional .android.graphics.RectProto given_content_insets = 6;
optional .android.graphics.RectProto frame = 7;
optional .android.graphics.RectProto containing_frame = 8;
optional .android.graphics.RectProto parent_frame = 9;
optional .android.graphics.RectProto content_frame = 10;
optional .android.graphics.RectProto content_insets = 11;
optional .android.graphics.RectProto surface_insets = 12;
optional WindowStateAnimatorProto animator = 13;
optional bool animating_exit = 14;
repeated WindowStateProto child_windows = 15;
}
message IdentifierProto {
int32 hash_code = 1;
int32 user_id = 2;
string title = 3;
optional int32 hash_code = 1;
optional int32 user_id = 2;
optional string title = 3;
}
/* represents WindowStateAnimator */
message WindowStateAnimatorProto {
.android.graphics.RectProto last_clip_rect = 1;
WindowSurfaceControllerProto surface = 2;
optional .android.graphics.RectProto last_clip_rect = 1;
optional WindowSurfaceControllerProto surface = 2;
}
/* represents WindowSurfaceController */
message WindowSurfaceControllerProto {
bool shown = 1;
int32 layer = 2;
optional bool shown = 1;
optional int32 layer = 2;
}
/* represents ScreenRotationAnimation */
message ScreenRotationAnimationProto {
bool started = 1;
bool animation_running = 2;
optional bool started = 1;
optional bool animation_running = 2;
}
/* represents WindowContainer */
message WindowContainerProto {
ConfigurationContainerProto configuration_container = 1;
int32 orientation = 2;
optional ConfigurationContainerProto configuration_container = 1;
optional int32 orientation = 2;
}
/* represents ConfigurationContainer */
message ConfigurationContainerProto {
.android.content.ConfigurationProto override_configuration = 1;
.android.content.ConfigurationProto full_configuration = 2;
.android.content.ConfigurationProto merged_override_configuration = 3;
optional .android.content.ConfigurationProto override_configuration = 1;
optional .android.content.ConfigurationProto full_configuration = 2;
optional .android.content.ConfigurationProto merged_override_configuration = 3;
}

21
core/proto/android/service/appwidget.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.service.appwidget;
option java_multiple_files = true;
@@ -28,13 +27,13 @@ message AppWidgetServiceDumpProto {
// represents a bound widget
message WidgetProto {
bool isCrossProfile = 1; // true if host and provider belong to diff users
bool isHostStopped = 2; // true if host has not called startListening yet
string hostPackage = 3;
string providerPackage = 4;
string providerClass = 5;
int32 minWidth = 6;
int32 minHeight = 7;
int32 maxWidth = 8;
int32 maxHeight = 9;
optional bool isCrossProfile = 1; // true if host and provider belong to diff users
optional bool isHostStopped = 2; // true if host has not called startListening yet
optional string hostPackage = 3;
optional string providerPackage = 4;
optional string providerClass = 5;
optional int32 minWidth = 6;
optional int32 minHeight = 7;
optional int32 maxWidth = 8;
optional int32 maxHeight = 9;
}

29
core/proto/android/service/battery.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.service.battery;
option java_multiple_files = true;
@@ -48,29 +47,29 @@ message BatteryServiceDumpProto {
}
// If true: UPDATES STOPPED -- use 'reset' to restart
bool are_updates_stopped = 1;
optional bool are_updates_stopped = 1;
// Plugged status of power sources
BatteryPlugged plugged = 2;
optional BatteryPlugged plugged = 2;
// Max current in microamperes
int32 max_charging_current = 3;
optional int32 max_charging_current = 3;
// Max voltage
int32 max_charging_voltage = 4;
optional int32 max_charging_voltage = 4;
// Battery capacity in microampere-hours
int32 charge_counter = 5;
optional int32 charge_counter = 5;
// Charging status
BatteryStatus status = 6;
optional BatteryStatus status = 6;
// Battery health
BatteryHealth health = 7;
optional BatteryHealth health = 7;
// True if the battery is present
bool is_present = 8;
optional bool is_present = 8;
// Charge level, from 0 through "scale" inclusive
int32 level = 9;
optional int32 level = 9;
// The maximum value for the charge level
int32 scale = 10;
optional int32 scale = 10;
// Battery voltage in millivolts
int32 voltage = 11;
optional int32 voltage = 11;
// Battery temperature in tenths of a degree Centigrade
int32 temperature = 12;
optional int32 temperature = 12;
// The type of battery installed, e.g. "Li-ion"
string technology = 13;
optional string technology = 13;
}

5
core/proto/android/service/batterystats.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.service.batterystats;
option java_multiple_files = true;
@@ -24,5 +23,5 @@ option java_outer_classname = "BatteryStatsServiceProto";
import "frameworks/base/core/proto/android/os/batterystats.proto";
message BatteryStatsServiceDumpProto {
android.os.BatteryStatsProto batterystats = 1;
optional android.os.BatteryStatsProto batterystats = 1;
}

45
core/proto/android/service/diskstats.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.service.diskstats;
option java_multiple_files = true;
@@ -33,51 +32,51 @@ message DiskStatsServiceDumpProto {
ENCRYPTION_FILE_BASED = 3;
}
// Whether the latency test resulted in an error
bool has_test_error = 1;
optional bool has_test_error = 1;
// If the test errored, error message is contained here
string error_message = 2;
optional string error_message = 2;
// 512B write latency in milliseconds, if the test was successful
int32 write_512b_latency_millis = 3;
optional int32 write_512b_latency_millis = 3;
// Free Space in the major partitions
repeated DiskStatsFreeSpaceProto partitions_free_space = 4;
// Is the device using file-based encryption, full disk encryption or other
EncryptionType encryption = 5;
optional EncryptionType encryption = 5;
// Cached values of folder sizes, etc.
DiskStatsCachedValuesProto cached_folder_sizes = 6;
optional DiskStatsCachedValuesProto cached_folder_sizes = 6;
}
message DiskStatsCachedValuesProto {
// Total app code size, in kilobytes
int64 agg_apps_size = 1;
optional int64 agg_apps_size = 1;
// Total app cache size, in kilobytes
int64 agg_apps_cache_size = 2;
optional int64 agg_apps_cache_size = 2;
// Size of image files, in kilobytes
int64 photos_size = 3;
optional int64 photos_size = 3;
// Size of video files, in kilobytes
int64 videos_size = 4;
optional int64 videos_size = 4;
// Size of audio files, in kilobytes
int64 audio_size = 5;
optional int64 audio_size = 5;
// Size of downloads, in kilobytes
int64 downloads_size = 6;
optional int64 downloads_size = 6;
// Size of system directory, in kilobytes
int64 system_size = 7;
optional int64 system_size = 7;
// Size of other files, in kilobytes
int64 other_size = 8;
optional int64 other_size = 8;
// Sizes of individual packages
repeated DiskStatsAppSizesProto app_sizes = 9;
// Total app data size, in kilobytes
int64 agg_apps_data_size = 10;
optional int64 agg_apps_data_size = 10;
}
message DiskStatsAppSizesProto {
// Name of the package
string package_name = 1;
optional string package_name = 1;
// App's code size in kilobytes
int64 app_size = 2;
optional int64 app_size = 2;
// App's cache size in kilobytes
int64 cache_size = 3;
optional int64 cache_size = 3;
// App's data size in kilobytes
int64 app_data_size = 4;
optional int64 app_data_size = 4;
}
message DiskStatsFreeSpaceProto {
@@ -90,9 +89,9 @@ message DiskStatsFreeSpaceProto {
FOLDER_SYSTEM = 2;
}
// Which folder?
Folder folder = 1;
optional Folder folder = 1;
// Available space, in kilobytes
int64 available_space = 2;
optional int64 available_space = 2;
// Total space, in kilobytes
int64 total_space = 3;
optional int64 total_space = 3;
}

21
core/proto/android/service/fingerprint.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.service.fingerprint;
option java_multiple_files = true;
@@ -28,33 +27,33 @@ message FingerprintServiceDumpProto {
message FingerprintUserStatsProto {
// Should be 0, 10, 11, 12, etc. where 0 is the owner.
int32 user_id = 1;
optional int32 user_id = 1;
// The number of fingerprints registered to this user.
int32 num_fingerprints = 2;
optional int32 num_fingerprints = 2;
// Normal fingerprint authentications (e.g. lockscreen).
FingerprintActionStatsProto normal = 3;
optional FingerprintActionStatsProto normal = 3;
// Crypto authentications (e.g. to unlock password storage, make secure
// purchases, etc).
FingerprintActionStatsProto crypto = 4;
optional FingerprintActionStatsProto crypto = 4;
}
message FingerprintActionStatsProto {
// Number of accepted fingerprints.
int32 accept = 1;
optional int32 accept = 1;
// Number of rejected fingerprints.
int32 reject = 2;
optional int32 reject = 2;
// Total number of acquisitions. Should be >= accept+reject due to poor
// image acquisition in some cases (too fast, too slow, dirty sensor, etc.)
int32 acquire = 3;
optional int32 acquire = 3;
// Total number of lockouts.
int32 lockout = 4;
optional int32 lockout = 4;
// Total number of permanent lockouts.
int32 lockout_permanent = 5;
optional int32 lockout_permanent = 5;
}

31
core/proto/android/service/graphicsstats.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.service;
option java_multiple_files = true;
@@ -29,19 +28,19 @@ message GraphicsStatsServiceDumpProto {
message GraphicsStatsProto {
// The package name of the app
string package_name = 1;
optional string package_name = 1;
// The version code of the app
int32 version_code = 2;
optional int32 version_code = 2;
// The start & end timestamps in UTC as
// milliseconds since January 1, 1970
// Compatible with java.util.Date#setTime()
int64 stats_start = 3;
int64 stats_end = 4;
optional int64 stats_start = 3;
optional int64 stats_end = 4;
// The aggregated statistics for the package
GraphicsStatsJankSummaryProto summary = 5;
optional GraphicsStatsJankSummaryProto summary = 5;
// The frame time histogram for the package
repeated GraphicsStatsHistogramBucketProto histogram = 6;
@@ -49,31 +48,31 @@ message GraphicsStatsProto {
message GraphicsStatsJankSummaryProto {
// Distinct frame count.
int32 total_frames = 1;
optional int32 total_frames = 1;
// Number of frames with slow render time. Frames are considered janky if
// they took more than a vsync interval (typically 16.667ms) to be rendered.
int32 janky_frames = 2;
optional int32 janky_frames = 2;
// Number of "missed vsync" events.
int32 missed_vsync_count = 3;
optional int32 missed_vsync_count = 3;
// Number of "high input latency" events.
int32 high_input_latency_count = 4;
optional int32 high_input_latency_count = 4;
// Number of "slow UI thread" events.
int32 slow_ui_thread_count = 5;
optional int32 slow_ui_thread_count = 5;
// Number of "slow bitmap upload" events.
int32 slow_bitmap_upload_count = 6;
optional int32 slow_bitmap_upload_count = 6;
// Number of "slow draw" events.
int32 slow_draw_count = 7;
optional int32 slow_draw_count = 7;
}
message GraphicsStatsHistogramBucketProto {
// Lower bound of render time in milliseconds.
int32 render_millis = 1;
optional int32 render_millis = 1;
// Number of frames in the bucket.
int32 frame_count = 2;
optional int32 frame_count = 2;
}

55
core/proto/android/service/netstats.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.service;
option java_multiple_files = true;
@@ -28,23 +27,23 @@ message NetworkStatsServiceDumpProto {
repeated NetworkInterfaceProto active_uid_interfaces = 2;
// Device level network stats, which may include non-IP layer traffic.
NetworkStatsRecorderProto dev_stats = 3;
optional NetworkStatsRecorderProto dev_stats = 3;
// IP-layer traffic stats.
NetworkStatsRecorderProto xt_stats = 4;
optional NetworkStatsRecorderProto xt_stats = 4;
// Per-UID network stats.
NetworkStatsRecorderProto uid_stats = 5;
optional NetworkStatsRecorderProto uid_stats = 5;
// Per-UID, per-tag network stats, excluding the default tag (i.e. tag=0).
NetworkStatsRecorderProto uid_tag_stats = 6;
optional NetworkStatsRecorderProto uid_tag_stats = 6;
}
// Corresponds to NetworkStatsService.mActiveIfaces/mActiveUidIfaces.
message NetworkInterfaceProto {
string interface = 1;
optional string interface = 1;
NetworkIdentitySetProto identities = 2;
optional NetworkIdentitySetProto identities = 2;
}
// Corresponds to NetworkIdentitySet.
@@ -55,22 +54,22 @@ message NetworkIdentitySetProto {
// Corresponds to NetworkIdentity.
message NetworkIdentityProto {
// Constats from ConnectivityManager.TYPE_*.
int32 type = 1;
optional int32 type = 1;
string subscriber_id = 2;
optional string subscriber_id = 2;
string network_id = 3;
optional string network_id = 3;
bool roaming = 4;
optional bool roaming = 4;
bool metered = 5;
optional bool metered = 5;
}
// Corresponds to NetworkStatsRecorder.
message NetworkStatsRecorderProto {
int64 pending_total_bytes = 1;
optional int64 pending_total_bytes = 1;
NetworkStatsCollectionProto complete_history = 2;
optional NetworkStatsCollectionProto complete_history = 2;
}
// Corresponds to NetworkStatsCollection.
@@ -80,26 +79,26 @@ message NetworkStatsCollectionProto {
// Corresponds to NetworkStatsCollection.mStats.
message NetworkStatsCollectionStatsProto {
NetworkStatsCollectionKeyProto key = 1;
optional NetworkStatsCollectionKeyProto key = 1;
NetworkStatsHistoryProto history = 2;
optional NetworkStatsHistoryProto history = 2;
}
// Corresponds to NetworkStatsCollection.Key.
message NetworkStatsCollectionKeyProto {
NetworkIdentitySetProto identity = 1;
optional NetworkIdentitySetProto identity = 1;
int32 uid = 2;
optional int32 uid = 2;
int32 set = 3;
optional int32 set = 3;
int32 tag = 4;
optional int32 tag = 4;
}
// Corresponds to NetworkStatsHistory.
message NetworkStatsHistoryProto {
// Duration for this bucket in milliseconds.
int64 bucket_duration_ms = 1;
optional int64 bucket_duration_ms = 1;
repeated NetworkStatsHistoryBucketProto buckets = 2;
}
@@ -107,15 +106,15 @@ message NetworkStatsHistoryProto {
// Corresponds to each bucket in NetworkStatsHistory.
message NetworkStatsHistoryBucketProto {
// Bucket start time in milliseconds since epoch.
int64 bucket_start_ms = 1;
optional int64 bucket_start_ms = 1;
int64 rx_bytes = 2;
optional int64 rx_bytes = 2;
int64 rx_packets = 3;
optional int64 rx_packets = 3;
int64 tx_bytes = 4;
optional int64 tx_bytes = 4;
int64 tx_packets = 5;
optional int64 tx_packets = 5;
int64 operations = 6;
optional int64 operations = 6;
}

98
core/proto/android/service/notification.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.service.notification;
option java_multiple_files = true;
@@ -29,54 +28,60 @@ import "frameworks/base/core/proto/android/content/component_name.proto";
message NotificationServiceDumpProto {
repeated NotificationRecordProto records = 1;
ZenModeProto zen = 2;
optional ZenModeProto zen = 2;
ManagedServicesProto notification_listeners = 3;
optional ManagedServicesProto notification_listeners = 3;
int32 listener_hints = 4;
optional int32 listener_hints = 4;
repeated ListenersDisablingEffectsProto listeners_disabling_effects = 5;
ManagedServicesProto notification_assistants = 6;
optional ManagedServicesProto notification_assistants = 6;
ManagedServicesProto condition_providers = 7;
optional ManagedServicesProto condition_providers = 7;
RankingHelperProto ranking_config = 8;
optional RankingHelperProto ranking_config = 8;
}
message NotificationRecordProto {
string key = 1;
State state = 2;
int32 flags = 3;
string channelId = 4;
string sound = 5;
int32 sound_usage = 6;
bool can_vibrate = 7;
bool can_show_light = 8;
string group_key = 9;
int32 importance = 10;
optional string key = 1;
enum State {
ENQUEUED = 0;
POSTED = 1;
SNOOZED = 2;
}
optional State state = 2;
optional int32 flags = 3;
optional string channelId = 4;
optional string sound = 5;
optional int32 sound_usage = 6;
optional bool can_vibrate = 7;
optional bool can_show_light = 8;
optional string group_key = 9;
optional int32 importance = 10;
}
message ListenersDisablingEffectsProto {
int32 hint = 1;
optional int32 hint = 1;
repeated ManagedServiceInfoProto listeners = 2;
}
message ManagedServiceInfoProto {
android.content.ComponentNameProto component = 1;
int32 user_id = 2;
string service = 3;
bool is_system = 4;
bool is_guest = 5;
optional android.content.ComponentNameProto component = 1;
optional int32 user_id = 2;
optional string service = 3;
optional bool is_system = 4;
optional bool is_guest = 5;
}
message ManagedServicesProto {
string caption = 1;
optional string caption = 1;
message ServiceProto {
repeated string name = 1;
int32 user_id = 2;
bool is_primary = 3;
optional int32 user_id = 2;
optional bool is_primary = 3;
}
repeated ServiceProto approved = 2;
@@ -94,17 +99,17 @@ message RankingHelperProto {
repeated string notification_signal_extractors = 1;
message RecordProto {
string package = 1;
optional string package = 1;
// Default value is UNKNOWN_UID = USER_NULL = -10000.
int32 uid = 2;
optional int32 uid = 2;
// Default is IMPORTANCE_UNSPECIFIED (-1000).
int32 importance = 3;
optional int32 importance = 3;
// Default is PRIORITY_DEFAULT (0).
int32 priority = 4;
optional int32 priority = 4;
// Default is VISIBILITY_NO_OVERRIDE (-1000).
int32 visibility = 5;
optional int32 visibility = 5;
// Default is true.
bool show_badge = 6;
optional bool show_badge = 6;
repeated android.app.NotificationChannelProto channels = 7;
repeated android.app.NotificationChannelGroupProto channel_groups = 8;
}
@@ -112,25 +117,16 @@ message RankingHelperProto {
repeated RecordProto records_restored_without_uid = 3;
}
enum State {
ENQUEUED = 0;
POSTED = 1;
SNOOZED = 2;
}
message ZenModeProto {
ZenMode zen_mode = 1;
enum ZenMode {
ZEN_MODE_OFF = 0;
ZEN_MODE_IMPORTANT_INTERRUPTIONS = 1;
ZEN_MODE_NO_INTERRUPTIONS = 2;
ZEN_MODE_ALARMS = 3;
}
optional ZenMode zen_mode = 1;
repeated string enabled_active_conditions = 2;
int32 suppressed_effects = 3;
optional int32 suppressed_effects = 3;
repeated string suppressors = 4;
android.app.PolicyProto policy = 5;
}
enum ZenMode {
ZEN_MODE_OFF = 0;
ZEN_MODE_IMPORTANT_INTERRUPTIONS = 1;
ZEN_MODE_NO_INTERRUPTIONS = 2;
ZEN_MODE_ALARMS = 3;
optional android.app.PolicyProto policy = 5;
}

61
core/proto/android/service/package.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.service.pm;
option java_multiple_files = true;
@@ -24,31 +23,31 @@ option java_outer_classname = "PackageServiceProto";
message PackageServiceDumpProto {
message PackageShortProto {
// Name of package. e.g. "com.android.providers.telephony".
string name = 1;
optional string name = 1;
// UID for this package as assigned by Android OS.
int32 uid = 2;
optional int32 uid = 2;
}
message SharedLibraryProto {
string name = 1;
optional string name = 1;
// True if library path is not null (jar), false otherwise (apk)
bool is_jar = 2;
optional bool is_jar = 2;
// Should be filled if is_jar is true
string path = 3;
optional string path = 3;
// Should be filled if is_jar is false
string apk = 4;
optional string apk = 4;
}
message FeatureProto {
string name = 1;
int32 version = 2;
optional string name = 1;
optional int32 version = 2;
}
message SharedUserProto {
int32 user_id = 1;
string name = 2;
optional int32 user_id = 1;
optional string name = 2;
}
// Installed packages.
PackageShortProto required_verifier_package = 1;
PackageShortProto verifier_package = 2;
optional PackageShortProto required_verifier_package = 1;
optional PackageShortProto verifier_package = 2;
repeated SharedLibraryProto shared_libraries = 3;
repeated FeatureProto features = 4;
repeated PackageProto packages = 5;
@@ -59,8 +58,8 @@ message PackageServiceDumpProto {
message PackageProto {
message SplitProto {
string name = 1;
int32 revision_code = 2;
optional string name = 1;
optional int32 revision_code = 2;
}
message UserInfoProto {
enum InstallType {
@@ -87,32 +86,32 @@ message PackageProto {
COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED = 4;
}
int32 id = 1;
InstallType install_type = 2;
optional int32 id = 1;
optional InstallType install_type = 2;
// Is the app restricted by owner / admin
bool is_hidden = 3;
bool is_suspended = 4;
bool is_stopped = 5;
bool is_launched = 6;
EnabledState enabled_state = 7;
string last_disabled_app_caller = 8;
optional bool is_hidden = 3;
optional bool is_suspended = 4;
optional bool is_stopped = 5;
optional bool is_launched = 6;
optional EnabledState enabled_state = 7;
optional string last_disabled_app_caller = 8;
}
// Name of package. e.g. "com.android.providers.telephony".
string name = 1;
optional string name = 1;
// UID for this package as assigned by Android OS.
int32 uid = 2;
optional int32 uid = 2;
// Package's reported version.
int32 version_code = 3;
optional int32 version_code = 3;
// Package's reported version string (what's displayed to the user).
string version_string = 4;
optional string version_string = 4;
// UTC timestamp of install
int64 install_time_ms = 5;
optional int64 install_time_ms = 5;
// Millisecond UTC timestamp of latest update adjusted to Google's server clock.
int64 update_time_ms = 6;
optional int64 update_time_ms = 6;
// From "dumpsys package" - name of package which installed this one.
// Typically "" if system app or "com.android.vending" if Play Store.
string installer_name = 7;
optional string installer_name = 7;
// Split APKs.
repeated SplitProto splits = 8;
// Per-user package info.

255
core/proto/android/service/power.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.service.power;
option java_multiple_files = true;
@@ -27,23 +26,23 @@ import "frameworks/base/core/proto/android/service/wirelesschargerdetector.proto
message PowerServiceDumpProto {
message ConstantsProto {
bool is_no_cached_wake_locks = 1;
optional bool is_no_cached_wake_locks = 1;
}
message ActiveWakeLocksProto {
bool is_cpu = 1;
bool is_screen_bright = 2;
bool is_screen_dim = 3;
bool is_button_bright = 4;
bool is_proximity_screen_off = 5;
optional bool is_cpu = 1;
optional bool is_screen_bright = 2;
optional bool is_screen_dim = 3;
optional bool is_button_bright = 4;
optional bool is_proximity_screen_off = 5;
// only set if already awake
bool is_stay_awake = 6;
bool is_doze = 7;
bool is_draw = 8;
optional bool is_stay_awake = 6;
optional bool is_doze = 7;
optional bool is_draw = 8;
}
message UserActivityProto {
bool is_screen_bright = 1;
bool is_screen_dim = 2;
bool is_screen_dream = 3;
optional bool is_screen_bright = 1;
optional bool is_screen_dim = 2;
optional bool is_screen_dream = 3;
}
message UidProto {
// Enum values gotten from ActivityManager.java
@@ -88,12 +87,12 @@ message PowerServiceDumpProto {
// Process does not exist.
PROCESS_STATE_NONEXISTENT = 17;
}
int32 uid = 1;
string uid_string = 2;
bool is_active = 3;
int32 num_wake_locks = 4;
bool is_process_state_unknown = 5;
ProcessState process_state = 6;
optional int32 uid = 1;
optional string uid_string = 2;
optional bool is_active = 3;
optional int32 num_wake_locks = 4;
optional bool is_process_state_unknown = 5;
optional ProcessState process_state = 6;
}
// Enum values gotten from PowerManagerInternal.java
@@ -120,123 +119,123 @@ message PowerServiceDumpProto {
DOCK_STATE_HE_DESK = 4;
}
ConstantsProto constants = 1;
optional ConstantsProto constants = 1;
// A bitfield that indicates what parts of the power state have
// changed and need to be recalculated.
int32 dirty = 2;
optional int32 dirty = 2;
// Indicates whether the device is awake or asleep or somewhere in between.
Wakefulness wakefulness = 3;
bool is_wakefulness_changing = 4;
optional Wakefulness wakefulness = 3;
optional bool is_wakefulness_changing = 4;
// True if the device is plugged into a power source.
bool is_powered = 5;
optional bool is_powered = 5;
// The current plug type
PlugType plug_type = 6;
optional PlugType plug_type = 6;
// The current battery level percentage.
int32 battery_level = 7;
optional int32 battery_level = 7;
// The battery level percentage at the time the dream started.
int32 battery_level_when_dream_started = 8;
optional int32 battery_level_when_dream_started = 8;
// The current dock state.
DockState dock_state = 9;
optional DockState dock_state = 9;
// True if the device should stay on.
bool is_stay_on = 10;
optional bool is_stay_on = 10;
// True if the proximity sensor reads a positive result.
bool is_proximity_positive = 11;
optional bool is_proximity_positive = 11;
// True if boot completed occurred. We keep the screen on until this happens.
bool is_boot_completed = 12;
optional bool is_boot_completed = 12;
// True if systemReady() has been called.
bool is_system_ready = 13;
optional bool is_system_ready = 13;
// True if auto-suspend mode is enabled.
bool is_hal_auto_suspend_mode_enabled = 14;
optional bool is_hal_auto_suspend_mode_enabled = 14;
// True if interactive mode is enabled.
bool is_hal_auto_interactive_mode_enabled = 15;
optional bool is_hal_auto_interactive_mode_enabled = 15;
// Summarizes the state of all active wakelocks.
ActiveWakeLocksProto active_wake_locks = 16;
optional ActiveWakeLocksProto active_wake_locks = 16;
// Have we scheduled a message to check for long wake locks? This is when
// we will check. (In milliseconds timestamp)
int64 notify_long_scheduled_ms = 17;
optional int64 notify_long_scheduled_ms = 17;
// Last time we checked for long wake locks. (In milliseconds timestamp)
int64 notify_long_dispatched_ms = 18;
optional int64 notify_long_dispatched_ms = 18;
// The time we decided to do next long check. (In milliseconds timestamp)
int64 notify_long_next_check_ms = 19;
optional int64 notify_long_next_check_ms = 19;
// Summarizes the effect of the user activity timer.
UserActivityProto user_activity = 20;
optional UserActivityProto user_activity = 20;
// If true, instructs the display controller to wait for the proximity
// sensor to go negative before turning the screen on.
bool is_request_wait_for_negative_proximity = 21;
optional bool is_request_wait_for_negative_proximity = 21;
// True if MSG_SANDMAN has been scheduled.
bool is_sandman_scheduled = 22;
optional bool is_sandman_scheduled = 22;
// True if the sandman has just been summoned for the first time since entering
// the dreaming or dozing state. Indicates whether a new dream should begin.
bool is_sandman_summoned = 23;
optional bool is_sandman_summoned = 23;
// If true, the device is in low power mode.
bool is_low_power_mode_enabled = 24;
optional bool is_low_power_mode_enabled = 24;
// True if the battery level is currently considered low.
bool is_battery_level_low = 25;
optional bool is_battery_level_low = 25;
// True if we are currently in light device idle mode.
bool is_light_device_idle_mode = 26;
optional bool is_light_device_idle_mode = 26;
// True if we are currently in device idle mode.
bool is_device_idle_mode = 27;
optional bool is_device_idle_mode = 27;
// Set of app ids that we will always respect the wake locks for.
repeated int32 device_idle_whitelist = 28;
// Set of app ids that are temporarily allowed to acquire wakelocks due to
// high-pri message
repeated int32 device_idle_temp_whitelist = 29;
// Timestamp of the last time the device was awoken.
int64 last_wake_time_ms = 30;
optional int64 last_wake_time_ms = 30;
// Timestamp of the last time the device was put to sleep.
int64 last_sleep_time_ms = 31;
optional int64 last_sleep_time_ms = 31;
// Timestamp of the last call to user activity.
int64 last_user_activity_time_ms = 32;
int64 last_user_activity_time_no_change_lights_ms = 33;
optional int64 last_user_activity_time_ms = 32;
optional int64 last_user_activity_time_no_change_lights_ms = 33;
// Timestamp of last interactive power hint.
int64 last_interactive_power_hint_time_ms = 34;
optional int64 last_interactive_power_hint_time_ms = 34;
// Timestamp of the last screen brightness boost.
int64 last_screen_brightness_boost_time_ms = 35;
optional int64 last_screen_brightness_boost_time_ms = 35;
// True if screen brightness boost is in progress.
bool is_screen_brightness_boost_in_progress = 36;
optional bool is_screen_brightness_boost_in_progress = 36;
// True if the display power state has been fully applied, which means the
// display is actually on or actually off or whatever was requested.
bool is_display_ready = 37;
optional bool is_display_ready = 37;
// True if the wake lock suspend blocker has been acquired.
bool is_holding_wake_lock_suspend_blocker = 38;
optional bool is_holding_wake_lock_suspend_blocker = 38;
// The suspend blocker used to keep the CPU alive when the display is on, the
// display is getting ready or there is user activity (in which case the
// display must be on).
bool is_holding_display_suspend_blocker = 39;
optional bool is_holding_display_suspend_blocker = 39;
// Settings and configuration
PowerServiceSettingsAndConfigurationDumpProto settings_and_configuration = 40;
optional PowerServiceSettingsAndConfigurationDumpProto settings_and_configuration = 40;
// Sleep timeout in ms
sint32 sleep_timeout_ms = 41;
optional sint32 sleep_timeout_ms = 41;
// Screen off timeout in ms
int32 screen_off_timeout_ms = 42;
optional int32 screen_off_timeout_ms = 42;
// Screen dim duration in ms
int32 screen_dim_duration_ms = 43;
optional int32 screen_dim_duration_ms = 43;
// We are currently in the middle of a batch change of uids.
bool are_uids_changing = 44;
optional bool are_uids_changing = 44;
// Some uids have actually changed while mUidsChanging was true.
bool are_uids_changed = 45;
optional bool are_uids_changed = 45;
// List of UIDs and their states
repeated UidProto uids = 46;
android.os.LooperProto looper = 47;
optional android.os.LooperProto looper = 47;
// List of all wake locks acquired by applications.
repeated WakeLockProto wake_locks = 48;
// List of all suspend blockers.
repeated SuspendBlockerProto suspend_blockers = 49;
WirelessChargerDetectorProto wireless_charger_detector = 50;
optional WirelessChargerDetectorProto wireless_charger_detector = 50;
}
message SuspendBlockerProto {
string name = 1;
int32 reference_count = 2;
optional string name = 1;
optional int32 reference_count = 2;
}
message WakeLockProto {
message WakeLockFlagsProto {
// Turn the screen on when the wake lock is acquired.
bool is_acquire_causes_wakeup = 1;
optional bool is_acquire_causes_wakeup = 1;
// When this wake lock is released, poke the user activity timer
// so the screen stays on for a little longer.
bool is_on_after_release = 2;
optional bool is_on_after_release = 2;
}
// Enum values gotten from PowerManager.java
@@ -259,31 +258,31 @@ message WakeLockProto {
DRAW_WAKE_LOCK = 128;
}
LockLevel lock_level = 1;
string tag = 2;
WakeLockFlagsProto flags = 3;
bool is_disabled = 4;
optional LockLevel lock_level = 1;
optional string tag = 2;
optional WakeLockFlagsProto flags = 3;
optional bool is_disabled = 4;
// Acquire time in ms
int64 acq_ms = 5;
bool is_notified_long = 6;
optional int64 acq_ms = 5;
optional bool is_notified_long = 6;
// Owner UID
int32 uid = 7;
optional int32 uid = 7;
// Owner PID
int32 pid = 8;
android.os.WorkSourceProto work_source = 9;
optional int32 pid = 8;
optional android.os.WorkSourceProto work_source = 9;
}
message PowerServiceSettingsAndConfigurationDumpProto {
message StayOnWhilePluggedInProto {
bool is_stay_on_while_plugged_in_ac = 1;
bool is_stay_on_while_plugged_in_usb = 2;
bool is_stay_on_while_plugged_in_wireless = 3;
optional bool is_stay_on_while_plugged_in_ac = 1;
optional bool is_stay_on_while_plugged_in_usb = 2;
optional bool is_stay_on_while_plugged_in_wireless = 3;
}
message ScreenBrightnessSettingLimitsProto {
int32 setting_minimum = 1;
int32 setting_maximum = 2;
int32 setting_default = 3;
int32 setting_for_vr_default = 4;
optional int32 setting_minimum = 1;
optional int32 setting_maximum = 2;
optional int32 setting_default = 3;
optional int32 setting_for_vr_default = 4;
}
// Enum values gotten from Settings.java
@@ -303,106 +302,106 @@ message PowerServiceSettingsAndConfigurationDumpProto {
// True to decouple auto-suspend mode from the display state.
bool is_decouple_hal_auto_suspend_mode_from_display_config = 1;
optional bool is_decouple_hal_auto_suspend_mode_from_display_config = 1;
// True to decouple interactive mode from the display state.
bool is_decouple_hal_interactive_mode_from_display_config = 2;
optional bool is_decouple_hal_interactive_mode_from_display_config = 2;
// True if the device should wake up when plugged or unplugged.
bool is_wake_up_when_plugged_or_unplugged_config = 3;
optional bool is_wake_up_when_plugged_or_unplugged_config = 3;
// True if the device should wake up when plugged or unplugged in theater mode.
bool is_wake_up_when_plugged_or_unplugged_in_theater_mode_config = 4;
optional bool is_wake_up_when_plugged_or_unplugged_in_theater_mode_config = 4;
// True if theater mode is enabled
bool is_theater_mode_enabled = 5;
optional bool is_theater_mode_enabled = 5;
// True if the device should suspend when the screen is off due to proximity.
bool is_suspend_when_screen_off_due_to_proximity_config = 6;
optional bool is_suspend_when_screen_off_due_to_proximity_config = 6;
// True if dreams are supported on this device.
bool are_dreams_supported_config = 7;
optional bool are_dreams_supported_config = 7;
// Default value for dreams enabled
bool are_dreams_enabled_by_default_config = 8;
optional bool are_dreams_enabled_by_default_config = 8;
// Default value for dreams activate-on-sleep
bool are_dreams_activated_on_sleep_by_default_config = 9;
optional bool are_dreams_activated_on_sleep_by_default_config = 9;
// Default value for dreams activate-on-dock
bool are_dreams_activated_on_dock_by_default_config = 10;
optional bool are_dreams_activated_on_dock_by_default_config = 10;
// True if dreams can run while not plugged in.
bool are_dreams_enabled_on_battery_config = 11;
optional bool are_dreams_enabled_on_battery_config = 11;
// Minimum battery level to allow dreaming when powered.
// Use -1 to disable this safety feature.
sint32 dreams_battery_level_minimum_when_powered_config = 12;
optional sint32 dreams_battery_level_minimum_when_powered_config = 12;
// Minimum battery level to allow dreaming when not powered.
// Use -1 to disable this safety feature.
sint32 dreams_battery_level_minimum_when_not_powered_config = 13;
optional sint32 dreams_battery_level_minimum_when_not_powered_config = 13;
// If the battery level drops by this percentage and the user activity
// timeout has expired, then assume the device is receiving insufficient
// current to charge effectively and terminate the dream. Use -1 to disable
// this safety feature.
sint32 dreams_battery_level_drain_cutoff_config = 14;
optional sint32 dreams_battery_level_drain_cutoff_config = 14;
// True if dreams are enabled by the user.
bool are_dreams_enabled_setting = 15;
optional bool are_dreams_enabled_setting = 15;
// True if dreams should be activated on sleep.
bool are_dreams_activate_on_sleep_setting = 16;
optional bool are_dreams_activate_on_sleep_setting = 16;
// True if dreams should be activated on dock.
bool are_dreams_activate_on_dock_setting = 17;
optional bool are_dreams_activate_on_dock_setting = 17;
// True if doze should not be started until after the screen off transition.
bool is_doze_after_screen_off_config = 18;
optional bool is_doze_after_screen_off_config = 18;
// If true, the device is in low power mode.
bool is_low_power_mode_setting = 19;
optional bool is_low_power_mode_setting = 19;
// Current state of whether the settings are allowing auto low power mode.
bool is_auto_low_power_mode_configured = 20;
optional bool is_auto_low_power_mode_configured = 20;
// The user turned off low power mode below the trigger level
bool is_auto_low_power_mode_snoozing = 21;
optional bool is_auto_low_power_mode_snoozing = 21;
// The minimum screen off timeout, in milliseconds.
int32 minimum_screen_off_timeout_config_ms = 22;
optional int32 minimum_screen_off_timeout_config_ms = 22;
// The screen dim duration, in milliseconds.
int32 maximum_screen_dim_duration_config_ms = 23;
optional int32 maximum_screen_dim_duration_config_ms = 23;
// The maximum screen dim time expressed as a ratio relative to the screen off timeout.
float maximum_screen_dim_ratio_config = 24;
optional float maximum_screen_dim_ratio_config = 24;
// The screen off timeout setting value in milliseconds.
int32 screen_off_timeout_setting_ms = 25;
optional int32 screen_off_timeout_setting_ms = 25;
// The sleep timeout setting value in milliseconds.
sint32 sleep_timeout_setting_ms = 26;
optional sint32 sleep_timeout_setting_ms = 26;
// The maximum allowable screen off timeout according to the device administration policy.
int32 maximum_screen_off_timeout_from_device_admin_ms = 27;
bool is_maximum_screen_off_timeout_from_device_admin_enforced_locked = 28;
optional int32 maximum_screen_off_timeout_from_device_admin_ms = 27;
optional bool is_maximum_screen_off_timeout_from_device_admin_enforced_locked = 28;
// The stay on while plugged in setting.
// A set of battery conditions under which to make the screen stay on.
StayOnWhilePluggedInProto stay_on_while_plugged_in = 29;
optional StayOnWhilePluggedInProto stay_on_while_plugged_in = 29;
// The screen brightness setting, from 0 to 255.
// Use -1 if no value has been set.
sint32 screen_brightness_setting = 30;
optional sint32 screen_brightness_setting = 30;
// The screen auto-brightness adjustment setting, from -1 to 1.
// Use 0 if there is no adjustment.
float screen_auto_brightness_adjustment_setting = 31;
optional float screen_auto_brightness_adjustment_setting = 31;
// The screen brightness mode.
ScreenBrightnessMode screen_brightness_mode_setting = 32;
optional ScreenBrightnessMode screen_brightness_mode_setting = 32;
// The screen brightness setting override from the window manager
// to allow the current foreground activity to override the brightness.
// Use -1 to disable.
sint32 screen_brightness_override_from_window_manager = 33;
optional sint32 screen_brightness_override_from_window_manager = 33;
// The user activity timeout override from the window manager
// to allow the current foreground activity to override the user activity
// timeout. Use -1 to disable.
sint64 user_activity_timeout_override_from_window_manager_ms = 34;
optional sint64 user_activity_timeout_override_from_window_manager_ms = 34;
// The window manager has determined the user to be inactive via other means.
// Set this to false to disable.
bool is_user_inactive_override_from_window_manager = 35;
optional bool is_user_inactive_override_from_window_manager = 35;
// The screen brightness setting override from the settings application
// to temporarily adjust the brightness until next updated,
// Use -1 to disable.
sint32 temporary_screen_brightness_setting_override = 36;
optional sint32 temporary_screen_brightness_setting_override = 36;
// The screen brightness adjustment setting override from the settings
// application to temporarily adjust the auto-brightness adjustment factor
// until next updated, in the range -1..1.
// Use NaN to disable.
float temporary_screen_auto_brightness_adjustment_setting_override = 37;
optional float temporary_screen_auto_brightness_adjustment_setting_override = 37;
// The screen state to use while dozing.
DisplayState doze_screen_state_override_from_dream_manager = 38;
optional DisplayState doze_screen_state_override_from_dream_manager = 38;
// The screen brightness to use while dozing.
float dozed_screen_brightness_override_from_dream_manager = 39;
optional float dozed_screen_brightness_override_from_dream_manager = 39;
// Screen brightness settings limits.
ScreenBrightnessSettingLimitsProto screen_brightness_setting_limits = 40;
optional ScreenBrightnessSettingLimitsProto screen_brightness_setting_limits = 40;
// The screen brightness setting, from 0 to 255, to be used while in VR Mode.
int32 screen_brightness_for_vr_setting = 41;
optional int32 screen_brightness_for_vr_setting = 41;
// True if double tap to wake is enabled
bool is_double_tap_wake_enabled = 42;
optional bool is_double_tap_wake_enabled = 42;
// True if we are currently in VR Mode.
bool is_vr_mode_enabled = 43;
optional bool is_vr_mode_enabled = 43;
}

129
core/proto/android/service/print.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.service.print;
option java_multiple_files = true;
@@ -30,7 +29,7 @@ message PrintServiceDumpProto {
message PrintUserStateProto {
// Should be 0, 10, 11, 12, etc. where 0 is the owner.
int32 user_id = 1;
optional int32 user_id = 1;
// The installed print services
repeated InstalledPrintServiceProto installed_services = 2;
@@ -48,18 +47,18 @@ message PrintUserStateProto {
repeated PrinterDiscoverySessionProto discovery_sessions = 6;
// The print spooler state
PrintSpoolerStateProto print_spooler_state = 7;
optional PrintSpoolerStateProto print_spooler_state = 7;
}
message PrintSpoolerStateProto {
// Is the print spooler destroyed?
bool is_destroyed = 1;
optional bool is_destroyed = 1;
// Is the print spooler bound?
bool is_bound = 2;
optional bool is_bound = 2;
// State internal to the print spooler
PrintSpoolerInternalStateProto internal_state = 3;
optional PrintSpoolerInternalStateProto internal_state = 3;
}
message PrintSpoolerInternalStateProto {
@@ -75,7 +74,7 @@ message PrintSpoolerInternalStateProto {
message PrinterCapabilitiesProto {
// Minimum margins of the printer
MarginsProto min_margins = 1;
optional MarginsProto min_margins = 1;
// List of supported media sizes
repeated MediaSizeProto media_sizes = 2;
@@ -92,10 +91,10 @@ message PrinterCapabilitiesProto {
message PrinterInfoProto {
// The id of the printer
PrinterIdProto id = 1;
optional PrinterIdProto id = 1;
// The name of the printer
string name = 2;
optional string name = 2;
enum Status {
// unused
@@ -111,21 +110,21 @@ message PrinterInfoProto {
STATUS_UNAVAILABLE = 3;
}
// The status of the printer
Status status = 3;
optional Status status = 3;
// The description of the printer
string description = 4;
optional string description = 4;
// The capabilities of the printer
PrinterCapabilitiesProto capabilities = 5;
optional PrinterCapabilitiesProto capabilities = 5;
}
message PrinterDiscoverySessionProto {
// Is this session destroyed?
bool is_destroyed = 1;
optional bool is_destroyed = 1;
// Is printer discovery in progress?
bool is_printer_discovery_in_progress = 2;
optional bool is_printer_discovery_in_progress = 2;
// List of printer discovery observers
repeated string printer_discovery_observers = 3;
@@ -142,44 +141,44 @@ message PrinterDiscoverySessionProto {
message InstalledPrintServiceProto {
// Component name of the service
android.content.ComponentNameProto component_name = 1;
optional android.content.ComponentNameProto component_name = 1;
// Settings activity for this service
string settings_activity = 2;
optional string settings_activity = 2;
// Add printers activity for this service
string add_printers_activity = 3;
optional string add_printers_activity = 3;
// Advances options activity for this service
string advanced_options_activity = 4;
optional string advanced_options_activity = 4;
}
message PrinterIdProto {
// Component name of the service that reported the printer
android.content.ComponentNameProto service_name = 1;
optional android.content.ComponentNameProto service_name = 1;
// Local id of the printer
string local_id = 2;
optional string local_id = 2;
}
message ActivePrintServiceProto {
// Component name of the service
android.content.ComponentNameProto component_name = 1;
optional android.content.ComponentNameProto component_name = 1;
// Is the active service destroyed
bool is_destroyed = 2;
optional bool is_destroyed = 2;
// Is the active service bound
bool is_bound = 3;
optional bool is_bound = 3;
// Has the active service a discovery session
bool has_discovery_session = 4;
optional bool has_discovery_session = 4;
// Has the active service a active print jobs
bool has_active_print_jobs = 5;
optional bool has_active_print_jobs = 5;
// Is the active service discovering printers
bool is_discovering_printers = 6;
optional bool is_discovering_printers = 6;
// The tracked printers of this active service
repeated PrinterIdProto tracked_printers = 7;
@@ -187,58 +186,58 @@ message ActivePrintServiceProto {
message MediaSizeProto {
// Id of this media size
string id = 1;
optional string id = 1;
// Label of this media size
string label = 2;
optional string label = 2;
// Height of the media
int32 height_mils = 3;
optional int32 height_mils = 3;
// Width of the media
int32 width_mils = 4;
optional int32 width_mils = 4;
}
message ResolutionProto {
// Id of this resolution
string id = 1;
optional string id = 1;
// Label for this resoltion
string label = 2;
optional string label = 2;
// Resolution in horizontal orientation
int32 horizontal_dpi = 3;
optional int32 horizontal_dpi = 3;
// Resolution in vertical orientation
int32 vertical_dpi = 4;
optional int32 vertical_dpi = 4;
}
message MarginsProto {
// Space at the top
int32 top_mils = 1;
optional int32 top_mils = 1;
// Space at the left
int32 left_mils = 2;
optional int32 left_mils = 2;
// Space at the right
int32 right_mils = 3;
optional int32 right_mils = 3;
// Space at the bottom
int32 bottom_mils = 4;
optional int32 bottom_mils = 4;
}
message PrintAttributesProto {
// Media to use
ResolutionProto media_size = 1;
optional ResolutionProto media_size = 1;
// Is the media in portrait mode?
bool is_portrait = 2;
optional bool is_portrait = 2;
// Resolution to use
ResolutionProto resolution = 3;
optional ResolutionProto resolution = 3;
// Margins around the document
MarginsProto min_margins = 4;
optional MarginsProto min_margins = 4;
enum ColorMode {
// unused
@@ -251,7 +250,7 @@ message PrintAttributesProto {
COLOR_MODE_COLOR = 2;
}
// Color mode to use
ColorMode color_mode = 5;
optional ColorMode color_mode = 5;
enum DuplexMode {
// unused
@@ -267,37 +266,37 @@ message PrintAttributesProto {
DUPLEX_MODE_SHORT_EDGE = 4;
}
// Duplex mode to use
DuplexMode duplex_mode = 6;
optional DuplexMode duplex_mode = 6;
}
message PrintDocumentInfoProto {
// Name of the document to print
string name = 1;
optional string name = 1;
// Number of pages in the doc
int32 page_count = 2;
optional int32 page_count = 2;
// Type of content (see PrintDocumentInfo.ContentType)
int32 content_type = 3;
optional int32 content_type = 3;
// The size of the the document
int64 data_size = 4;
optional int64 data_size = 4;
}
message PageRangeProto {
// Start of the range
int32 start = 1;
optional int32 start = 1;
// End of the range (included)
int32 end = 2;
optional int32 end = 2;
}
message PrintJobInfoProto {
// Label of the job
string label = 1;
optional string label = 1;
// Id of the job
string print_job_id = 2;
optional string print_job_id = 2;
enum State {
// Unknown state
@@ -326,43 +325,43 @@ message PrintJobInfoProto {
}
// State of the job
State state = 3;
optional State state = 3;
// Printer handling the job
PrinterIdProto printer = 4;
optional PrinterIdProto printer = 4;
// Tag assigned to the job
string tag = 5;
optional string tag = 5;
// Time the job was created
int64 creation_time = 6;
optional int64 creation_time = 6;
// Attributes of the job
PrintAttributesProto attributes = 7;
optional PrintAttributesProto attributes = 7;
// Document info of the job
PrintDocumentInfoProto document_info = 8;
optional PrintDocumentInfoProto document_info = 8;
// If the job current getting canceled
bool is_canceling = 9;
optional bool is_canceling = 9;
// The selected ranges of the job
repeated PageRangeProto pages = 10;
// Does the job have any advanced options
bool has_advanced_options = 11;
optional bool has_advanced_options = 11;
// Progress of the job
float progress = 12;
optional float progress = 12;
// The current service set state
string status = 13;
optional string status = 13;
}
message CachedPrintJobProto {
// The id of the app the job belongs to
int32 app_id = 1;
optional int32 app_id = 1;
// The print job
PrintJobInfoProto print_job = 2;
optional PrintJobInfoProto print_job = 2;
}

47
core/proto/android/service/procstats.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_multiple_files = true;
option java_outer_classname = "ProcessStatsServiceProto";
@@ -30,11 +29,11 @@ package android.service.procstats;
*/
message ProcessStatsServiceDumpProto {
ProcessStatsSectionProto procstats_now = 1;
optional ProcessStatsSectionProto procstats_now = 1;
ProcessStatsSectionProto procstats_over_3hrs = 2;
optional ProcessStatsSectionProto procstats_over_3hrs = 2;
ProcessStatsSectionProto procstats_over_24hrs = 3;
optional ProcessStatsSectionProto procstats_over_24hrs = 3;
}
/**
@@ -46,22 +45,22 @@ message ProcessStatsServiceDumpProto {
message ProcessStatsSectionProto {
// Elapsed realtime at start of report.
int64 start_realtime_ms = 1;
optional int64 start_realtime_ms = 1;
// Elapsed realtime at end of report.
int64 end_realtime_ms = 2;
optional int64 end_realtime_ms = 2;
// CPU uptime at start of report.
int64 start_uptime_ms = 3;
optional int64 start_uptime_ms = 3;
// CPU uptime at end of report.
int64 end_uptime_ms = 4;
optional int64 end_uptime_ms = 4;
// System runtime library. e.g. "libdvm.so", "libart.so".
string runtime = 5;
optional string runtime = 5;
// whether kernel reports swapped pss.
bool has_swapped_pss = 6;
optional bool has_swapped_pss = 6;
// Data completeness. e.g. "complete", "partial", shutdown", or "sysprops".
enum Status {
@@ -81,23 +80,23 @@ message ProcessStatsSectionProto {
message ProcessStatsProto {
// Name of process.
string process = 1;
optional string process = 1;
// Uid of the process.
int32 uid = 2;
optional int32 uid = 2;
// Information about how often kills occurred
message Kill {
// Count of excessive CPU kills
int32 cpu = 1;
optional int32 cpu = 1;
// Count of kills when cached
int32 cached = 2;
optional int32 cached = 2;
// PSS stats during cached kill
android.util.AggStats cached_pss = 3;
optional android.util.AggStats cached_pss = 3;
}
Kill kill = 3;
optional Kill kill = 3;
message State {
enum ScreenState {
@@ -105,7 +104,7 @@ message ProcessStatsProto {
OFF = 1;
ON = 2;
}
ScreenState screen_state = 1;
optional ScreenState screen_state = 1;
enum MemoryState {
MEMORY_UNKNOWN = 0;
@@ -114,7 +113,7 @@ message ProcessStatsProto {
LOW = 3; // low memory.
CRITICAL = 4; // critical memory.
}
MemoryState memory_state = 2;
optional MemoryState memory_state = 2;
enum ProcessState {
PROCESS_UNKNOWN = 0;
@@ -147,19 +146,19 @@ message ProcessStatsProto {
// Cached process that is empty.
CACHED_EMPTY = 14;
}
ProcessState process_state = 3;
optional ProcessState process_state = 3;
// Millisecond duration spent in this state
int64 duration_ms = 4;
optional int64 duration_ms = 4;
// # of samples taken
int32 sample_size = 5;
optional int32 sample_size = 5;
// PSS is memory reserved for this process
android.util.AggStats pss = 6;
optional android.util.AggStats pss = 6;
// USS is memory shared between processes, divided evenly for accounting
android.util.AggStats uss = 7;
optional android.util.AggStats uss = 7;
}
repeated State states = 5;
}

29
core/proto/android/service/wirelesschargerdetector.proto
View File

@@ -14,37 +14,36 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.service.power;
option java_multiple_files = true;
message WirelessChargerDetectorProto {
message VectorProto {
float x = 1;
float y = 2;
float z = 3;
optional float x = 1;
optional float y = 2;
optional float z = 3;
}
// Previously observed wireless power state.
bool is_powered_wirelessly = 1;
optional bool is_powered_wirelessly = 1;
// True if the device is thought to be at rest on a wireless charger.
bool is_at_rest = 2;
optional bool is_at_rest = 2;
// The gravity vector most recently observed while at rest.
VectorProto rest = 3;
optional VectorProto rest = 3;
// True if detection is in progress.
bool is_detection_in_progress = 4;
optional bool is_detection_in_progress = 4;
// The time when detection was last performed.
int64 detection_start_time_ms = 5;
optional int64 detection_start_time_ms = 5;
// True if the rest position should be updated if at rest.
bool is_must_update_rest_position = 6;
optional bool is_must_update_rest_position = 6;
// The total number of samples collected.
int32 total_samples = 7;
optional int32 total_samples = 7;
// The number of samples collected that showed evidence of not being at rest.
int32 moving_samples = 8;
optional int32 moving_samples = 8;
// The value of the first sample that was collected.
VectorProto first_sample = 9;
optional VectorProto first_sample = 9;
// The value of the last sample that was collected.
VectorProto last_sample = 10;
optional VectorProto last_sample = 10;
}

3
core/proto/android/telephony/signalstrength.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
option java_package = "android.telephony";
option java_multiple_files = true;

9
core/proto/android/util/common.proto
View File

@@ -14,8 +14,7 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.util;
option java_multiple_files = true;
@@ -25,9 +24,9 @@ option java_multiple_files = true;
*/
message AggStats {
int64 min = 1;
optional int64 min = 1;
int64 average = 2;
optional int64 average = 2;
int64 max = 3;
optional int64 max = 3;
}

11
core/proto/android/view/displayinfo.proto
View File

@@ -14,16 +14,15 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.view;
option java_multiple_files = true;
/* represents DisplayInfo */
message DisplayInfoProto {
int32 logical_width = 1;
int32 logical_height = 2;
int32 app_width = 3;
int32 app_height = 4;
optional int32 logical_width = 1;
optional int32 logical_height = 2;
optional int32 app_width = 3;
optional int32 app_height = 4;
}

5
core/proto/android/view/windowlayoutparams.proto
View File

@@ -14,13 +14,12 @@
* limitations under the License.
*/
syntax = "proto3";
syntax = "proto2";
package android.view;
option java_multiple_files = true;
/* represents WindowManager.LayoutParams */
message WindowLayoutParamsProto {
int32 type = 1;
optional int32 type = 1;
}

7
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -133,7 +133,6 @@ import android.service.notification.NotificationListenerService;
import android.service.notification.NotificationRankingUpdate;
import android.service.notification.NotificationRecordProto;
import android.service.notification.NotificationServiceDumpProto;
import android.service.notification.NotificationServiceProto;
import android.service.notification.NotificationStats;
import android.service.notification.SnoozeCriterion;
import android.service.notification.StatusBarNotification;
@@ -3263,7 +3262,7 @@ public class NotificationManagerService extends SystemService {
final NotificationRecord nr = mNotificationList.get(i);
if (filter.filtered && !filter.matches(nr.sbn)) continue;
nr.dump(proto, filter.redact);
proto.write(NotificationRecordProto.STATE, NotificationServiceProto.POSTED);
proto.write(NotificationRecordProto.STATE, NotificationRecordProto.POSTED);
}
}
N = mEnqueuedNotifications.size();
@@ -3272,7 +3271,7 @@ public class NotificationManagerService extends SystemService {
final NotificationRecord nr = mEnqueuedNotifications.get(i);
if (filter.filtered && !filter.matches(nr.sbn)) continue;
nr.dump(proto, filter.redact);
proto.write(NotificationRecordProto.STATE, NotificationServiceProto.ENQUEUED);
proto.write(NotificationRecordProto.STATE, NotificationRecordProto.ENQUEUED);
}
}
List<NotificationRecord> snoozed = mSnoozeHelper.getSnoozed();
@@ -3282,7 +3281,7 @@ public class NotificationManagerService extends SystemService {
final NotificationRecord nr = snoozed.get(i);
if (filter.filtered && !filter.matches(nr.sbn)) continue;
nr.dump(proto, filter.redact);
proto.write(NotificationRecordProto.STATE, NotificationServiceProto.SNOOZED);
proto.write(NotificationRecordProto.STATE, NotificationRecordProto.SNOOZED);
}
}
proto.end(records);