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

Commit d5127dce authored by Tej Singh's avatar Tej Singh Committed by Gerrit Code Review
Browse files

Merge changes from topic "tej_isolate_protologging" 

* changes:
  Remove network transport from core/proto
  Move service/enums.proto to proto_logging
  Add usb and networkcapabilities back to core/proto
parents 55fe87b2 80d273e4

core/proto/android/net/networkcapabilities.proto

0 → 100644
+118 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



syntax = "proto2";



package android.net;



option java_multiple_files = true;



import "frameworks/base/core/proto/android/privacy.proto";

import "frameworks/proto_logging/stats/enums/net/enums.proto";



/**

 * An android.net.NetworkCapabilities object.

 */

message NetworkCapabilitiesProto {

    option (.android.msg_privacy).dest = DEST_AUTOMATIC;



    repeated Transport transports = 1;



    enum NetCapability {

        // Indicates this is a network that has the ability to reach the

        // carrier's MMSC for sending and receiving MMS messages.

        NET_CAPABILITY_MMS = 0;

        // Indicates this is a network that has the ability to reach the

        // carrier's SUPL server, used to retrieve GPS information.

        NET_CAPABILITY_SUPL = 1;

        // Indicates this is a network that has the ability to reach the

        // carrier's DUN or tethering gateway.

        NET_CAPABILITY_DUN = 2;

        // Indicates this is a network that has the ability to reach the

        // carrier's FOTA portal, used for over the air updates.

        NET_CAPABILITY_FOTA = 3;

        // Indicates this is a network that has the ability to reach the

        // carrier's IMS servers, used for network registration and signaling.

        NET_CAPABILITY_IMS = 4;

        // Indicates this is a network that has the ability to reach the

        // carrier's CBS servers, used for carrier specific services.

        NET_CAPABILITY_CBS = 5;

        // Indicates this is a network that has the ability to reach a Wi-Fi

        // direct peer.

        NET_CAPABILITY_WIFI_P2P = 6;

        // Indicates this is a network that has the ability to reach a carrier's

        // Initial Attach servers.

        NET_CAPABILITY_IA = 7;

        // Indicates this is a network that has the ability to reach a carrier's

        // RCS servers, used for Rich Communication Services.

        NET_CAPABILITY_RCS = 8;

        // Indicates this is a network that has the ability to reach a carrier's

        // XCAP servers, used for configuration and control.

        NET_CAPABILITY_XCAP = 9;

        // Indicates this is a network that has the ability to reach a carrier's

        // Emergency IMS servers or other services, used for network signaling

        // during emergency calls.

        NET_CAPABILITY_EIMS = 10;

        // Indicates that this network is unmetered.

        NET_CAPABILITY_NOT_METERED = 11;

        // Indicates that this network should be able to reach the internet.

        NET_CAPABILITY_INTERNET = 12;

        // Indicates that this network is available for general use. If this is

        // not set applications should not attempt to communicate on this

        // network. Note that this is simply informative and not enforcement -

        // enforcement is handled via other means. Set by default.

        NET_CAPABILITY_NOT_RESTRICTED = 13;

        // Indicates that the user has indicated implicit trust of this network.

        // This generally means it's a sim-selected carrier, a plugged in

        // ethernet, a paired BT device or a wifi the user asked to connect to.

        // Untrusted networks are probably limited to unknown wifi AP. Set by

        // default.

        NET_CAPABILITY_TRUSTED = 14;

        // Indicates that this network is not a VPN.  This capability is set by

        // default and should be explicitly cleared for VPN networks.

        NET_CAPABILITY_NOT_VPN = 15;

        // Indicates that connectivity on this network was successfully

        // validated. For example, for a network with NET_CAPABILITY_INTERNET,

        // it means that Internet connectivity was successfully detected.

        NET_CAPABILITY_VALIDATED = 16;

        // Indicates that this network was found to have a captive portal in

        // place last time it was probed.

        NET_CAPABILITY_CAPTIVE_PORTAL = 17;

        // Indicates that this network is not roaming.

        NET_CAPABILITY_NOT_ROAMING = 18;

        // Indicates that this network is available for use by apps, and not a

        // network that is being kept up in the background to facilitate fast

        // network switching.

        NET_CAPABILITY_FOREGROUND = 19;

    }

    repeated NetCapability capabilities = 2;



    // Passive link bandwidth. This is a rough guide of the expected peak

    // bandwidth for the first hop on the given transport.  It is not measured,

    // but may take into account link parameters (Radio technology, allocated

    // channels, etc).

    optional int32 link_up_bandwidth_kbps = 3;

    optional int32 link_down_bandwidth_kbps = 4;



    optional string network_specifier = 5 [ (.android.privacy).dest = DEST_EXPLICIT ];



    // True if this object specifies a signal strength.

    optional bool can_report_signal_strength = 6;

    // This is a signed integer, and higher values indicate better signal. The

    // exact units are bearer-dependent. For example, Wi-Fi uses RSSI.

    // Only valid if can_report_signal_strength is true.

    optional sint32 signal_strength = 7;

}

core/proto/android/net/networkrequest.proto

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ package android.net; 


option java_multiple_files = true;



import "frameworks/base/core/proto/android/net/networkcapabilities.proto";

import "frameworks/base/core/proto/android/privacy.proto";

import "frameworks/proto_logging/stats/enums/net/networkcapabilities.proto";



/**

 * An android.net.NetworkRequest object.

core/proto/android/os/incident.proto

+1 −1
Original line number Diff line number Diff line
@@ -55,13 +55,13 @@ import "frameworks/base/core/proto/android/service/print.proto"; 
import "frameworks/base/core/proto/android/service/procstats.proto";

import "frameworks/base/core/proto/android/service/restricted_image.proto";

import "frameworks/base/core/proto/android/service/sensor_service.proto";

import "frameworks/base/core/proto/android/service/usb.proto";

import "frameworks/base/core/proto/android/util/event_log_tags.proto";

import "frameworks/base/core/proto/android/util/log.proto";

import "frameworks/base/core/proto/android/util/textdump.proto";

import "frameworks/base/core/proto/android/privacy.proto";

import "frameworks/base/core/proto/android/section.proto";

import "frameworks/base/proto/src/ipconnectivity.proto";

import "frameworks/proto_logging/stats/enums/service/usb.proto";



package android.os;

core/proto/android/service/enums.proto

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



syntax = "proto2";

package android.service;



option java_outer_classname = "ServiceProtoEnums";

option java_multiple_files = true;



enum UsbEndPointType {

    USB_ENDPOINT_TYPE_XFER_CONTROL = 0;

    USB_ENDPOINT_TYPE_XFER_ISOC = 1;

    USB_ENDPOINT_TYPE_XFER_BULK = 2;

    USB_ENDPOINT_TYPE_XFER_INT = 3;

}



enum UsbEndPointDirection {

    USB_ENDPOINT_DIR_OUT = 0;

    USB_ENDPOINT_DIR_IN = 0x80;

}



enum UsbConnectionRecordMode {

    USB_CONNECTION_RECORD_MODE_CONNECT = 0;

    USB_CONNECTION_RECORD_MODE_CONNECT_BADPARSE = 1;

    USB_CONNECTION_RECORD_MODE_CONNECT_BADDEVICE = 2;

    USB_CONNECTION_RECORD_MODE_DISCONNECT = -1;

}
 
 No newline at end of file

core/proto/android/service/usb.proto

0 → 100644
+431 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



syntax = "proto2";

package android.service.usb;



option java_multiple_files = true;

option java_outer_classname = "UsbServiceProto";



import "frameworks/base/core/proto/android/content/component_name.proto";

import "frameworks/base/core/proto/android/privacy.proto";

import "frameworks/proto_logging/stats/enums/service/enums.proto";



message UsbServiceDumpProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional UsbDeviceManagerProto device_manager = 1;

    optional UsbHostManagerProto host_manager = 2;

    optional UsbPortManagerProto port_manager = 3;

    optional UsbAlsaManagerProto alsa_manager = 4;

    optional UsbSettingsManagerProto settings_manager = 5;

    optional UsbPermissionsManagerProto permissions_manager = 6;

}



message UsbDeviceManagerProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional UsbHandlerProto handler = 1;

    optional UsbDebuggingManagerProto debugging_manager = 2;

}



message UsbHandlerProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    /* Same as android.hardware.usb.gadget.V1_0.GadgetFunction.* */

    enum Function {

        FUNCTION_ADB = 1;

        FUNCTION_ACCESSORY = 2;

        FUNCTION_MTP = 4;

        FUNCTION_MIDI = 8;

        FUNCTION_PTP = 16;

        FUNCTION_RNDIS = 32;

        FUNCTION_AUDIO_SOURCE = 64;

    }



    repeated Function current_functions = 1;

    optional bool current_functions_applied = 2;

    repeated Function screen_unlocked_functions = 3;

    optional bool screen_locked = 4;

    optional bool connected = 5;

    optional bool configured = 6;

    optional UsbAccessoryProto current_accessory = 7;

    optional bool host_connected = 8;

    optional bool source_power = 9;

    optional bool sink_power = 10;

    optional bool usb_charging = 11;

    optional bool hide_usb_notification = 12;

    optional bool audio_accessory_connected = 13;

    optional bool adb_enabled = 14;

    optional string kernel_state = 15;

    optional string kernel_function_list = 16;

}



message UsbAccessoryProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional string manufacturer = 1;

    optional string model = 2;

    // For "classical" USB-accessories the manufacturer bakes this into the

    // firmware of the device. If an Android phone is configured as accessory, the

    // app that sets up the accessory side of the connection set this. Either way,

    // these are part of the detection protocol, and so they cannot be user set or

    // unique.

    optional string description = 3;

    optional string version = 4;

    optional string uri = 5 [ (android.privacy).dest = DEST_EXPLICIT ];

    // Non-resettable hardware ID.

    optional string serial = 6 [ (android.privacy).dest = DEST_LOCAL ];

}



message UsbDebuggingManagerProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional bool connected_to_adb = 1;

    // A workstation that connects to the phone for debugging is identified by

    // this key.

    optional string last_key_received = 2 [ (android.privacy).dest = DEST_EXPLICIT ];

    optional string user_keys = 3 [ (android.privacy).dest = DEST_LOCAL ];

    optional string system_keys = 4 [ (android.privacy).dest = DEST_LOCAL ];

}



message UsbHostManagerProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional android.content.ComponentNameProto default_usb_host_connection_handler = 1;

    repeated UsbDeviceProto devices = 2;

    optional int32 num_connects = 3;

    repeated UsbConnectionRecordProto connections = 4;

}



message UsbDeviceProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    // Generic USB name, not user-provided.

    optional string name = 1;

    // ID specific to the vendor, not the device.

    optional int32 vendor_id = 2;

    // ID of this product type: Each vendor gives each product a unique ID. E.g.

    // all mice of the same model would have the same ID.

    optional int32 product_id = 3;

    optional int32 class = 4;

    optional int32 subclass = 5;

    optional int32 protocol = 6;

    optional string manufacturer_name = 7;

    optional string product_name = 8;

    optional string version = 9;

    // Non-resettable hardware ID.

    optional string serial_number = 10 [ (android.privacy).dest = DEST_LOCAL ];

    repeated UsbConfigurationProto configurations = 11;

}



message UsbConfigurationProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    // A single USB device can have several configurations and the app accessing

    // the USB device can switch between them. At any time only one can be active.

    // Each configuration can present completely different interfaces end

    // endpoints, i.e. a completely different behavior.

    optional int32 id = 1;

    // Hardware-defined name, not set by the user.

    optional string name = 2;

    optional uint32 attributes = 3;

    optional int32 max_power = 4;

    repeated UsbInterfaceProto interfaces = 5;

}



message UsbInterfaceProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    // Hardware defined. This is the id used by the app to identify the interface.

    optional int32 id = 1;

    optional int32 alternate_settings = 2;

    optional string name = 3;

    optional int32 class = 4;

    optional int32 subclass = 5;

    optional int32 protocol = 6;

    repeated UsbEndPointProto endpoints = 7;

}



message UsbEndPointProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional int32 endpoint_number = 1;

    optional android.service.UsbEndPointDirection direction = 2;

      // The address of the endpoint. Needed to read and write to the endpoint.

    optional int32 address = 3;

    optional android.service.UsbEndPointType type = 4;

    optional uint32 attributes = 5;

    optional int32 max_packet_size = 6;

    optional int32 interval = 7;

}



message UsbConnectionRecordProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    // usb device's address, e.g. 001/002, nothing about the phone

    optional string device_address = 1;

    optional android.service.UsbConnectionRecordMode mode = 2;

    optional int64 timestamp = 3;

    optional int32 manufacturer = 4;

    optional int32 product = 5;

    optional UsbIsHeadsetProto is_headset = 6;

}



message UsbIsHeadsetProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional bool in = 1;

    optional bool out = 2;

}



message UsbPortManagerProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional bool is_simulation_active = 1;

    repeated UsbPortInfoProto usb_ports = 2;

}



message UsbPortInfoProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional UsbPortProto port = 1;

    optional UsbPortStatusProto status = 2;

    optional bool can_change_mode = 3;

    optional bool can_change_power_role = 4;

    optional bool can_change_data_role = 5;

    optional int64 connected_at_millis = 6;

    optional int64 last_connect_duration_millis = 7;

}



message UsbPortProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    /* Same as android.hardware.usb.V1_1.Constants.PortMode_1_1 */

    enum Mode {

        MODE_NONE = 0;

        MODE_UFP = 1;

        MODE_DFP = 2;

        MODE_DRP = 3;

        MODE_AUDIO_ACCESSORY = 4;

        MODE_DEBUG_ACCESSORY = 8;

    }



    // ID of the port. A device (eg: Chromebooks) might have multiple ports.

    optional string id = 1;

    repeated Mode supported_modes = 2;

}



message UsbPortStatusProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    /* Same as android.hardware.usb.V1_0.Constants.PortPowerRole */

    enum PowerRole {

        POWER_ROLE_NONE = 0;

        POWER_ROLE_SOURCE = 1;

        POWER_ROLE_SINK = 2;

    }



    /* Same as android.hardware.usb.V1_0.Constants.PortDataRole */

    enum DataRole {

        DATA_ROLE_NONE = 0;

        DATA_ROLE_HOST = 1;

        DATA_ROLE_DEVICE = 2;

    }



    optional bool connected = 1;

    optional UsbPortProto.Mode current_mode = 2;

    optional PowerRole power_role = 3;

    optional DataRole data_role = 4;

    repeated UsbPortStatusRoleCombinationProto role_combinations = 5;

    optional android.service.ContaminantPresenceStatus contaminant_presence_status = 6;

}



message UsbPortStatusRoleCombinationProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional UsbPortStatusProto.PowerRole power_role = 1;

    optional UsbPortStatusProto.DataRole data_role = 2;

}



message UsbAlsaManagerProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional int32 cards_parser = 1;

    repeated UsbAlsaDeviceProto alsa_devices = 2;

    repeated UsbMidiDeviceProto midi_devices = 3;

}



message UsbAlsaDeviceProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional int32 card = 1;

    optional int32 device = 2;

    optional string name = 3;

    optional bool has_playback = 4;

    optional bool has_capture = 5;

    // usb device's address, e.g. 001/002, nothing about the phone

    optional string address = 6;

}



message UsbMidiDeviceProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional int32 card = 1;

    optional int32 device = 2;

    // usb device's address, e.g. 001/002, nothing about the phone

    optional string device_address = 3;

}



message UsbSettingsManagerProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    repeated UsbUserSettingsManagerProto user_settings = 1;

    repeated UsbProfileGroupSettingsManagerProto profile_group_settings = 2;

}



message UsbUserSettingsManagerProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional int32 user_id = 1;

    reserved 2; // previously device_permissions, now unused

    reserved 3; // previously accessory_permissions, now unused

    repeated UsbDeviceAttachedActivities device_attached_activities = 4;

    repeated UsbAccessoryAttachedActivities accessory_attached_activities = 5;

}



message UsbProfileGroupSettingsManagerProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    // The user id of the personal profile if the device has a work profile.

    optional int32 parent_user_id = 1;

    repeated UsbSettingsDevicePreferenceProto device_preferences = 2;

    repeated UsbSettingsAccessoryPreferenceProto accessory_preferences = 3;

}



message UsbSettingsDevicePreferenceProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional UsbDeviceFilterProto filter = 1;

    optional UserPackageProto user_package = 2;

}



message UsbPermissionsManagerProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    repeated UsbUserPermissionsManagerProto user_permissions = 1;

}



message UsbUserPermissionsManagerProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional int32 user_id = 1;



    repeated UsbDevicePermissionProto device_permissions = 2;

    repeated UsbAccessoryPermissionProto accessory_permissions = 3;



    repeated UsbDevicePersistentPermissionProto device_persistent_permissions = 4;

    repeated UsbAccessoryPersistentPermissionProto accessory_persistent_permissions = 5;

}



message UsbDevicePermissionProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    // Name of device set by manufacturer

    // All devices of the same model have the same name

    optional string device_name = 1;

    repeated int32 uids = 2;

}



message UsbAccessoryPermissionProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    // Description of accessory set by manufacturer

    // All accessories of the same model have the same description

    optional string accessory_description = 1;

    repeated int32 uids = 2;

}



message UsbDevicePersistentPermissionProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional UsbDeviceFilterProto device_filter = 1;

    repeated UsbUidPermissionProto permission_values = 2;

}



message UsbAccessoryPersistentPermissionProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional UsbAccessoryFilterProto accessory_filter = 1;

    repeated UsbUidPermissionProto permission_values = 2;

}



message UsbUidPermissionProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional int32 uid = 1;

    optional bool is_granted = 2;

}



message UsbDeviceFilterProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    // Mirrors the vendor_id of UsbDeviceProto.

    optional int32 vendor_id = 1;

    optional int32 product_id = 2;

    optional int32 class = 3;

    optional int32 subclass = 4;

    optional int32 protocol = 5;

    optional string manufacturer_name = 6;

    optional string product_name = 7;

    optional string serial_number = 8 [ (android.privacy).dest = DEST_EXPLICIT ];

}



message UserPackageProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional int32 user_id = 1;

    optional string package_name =2;

}



message UsbSettingsAccessoryPreferenceProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional UsbAccessoryFilterProto filter = 1;

    optional UserPackageProto user_package = 2;

}



message UsbAccessoryFilterProto {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional string manufacturer = 1;

    optional string model = 2;

    optional string version = 3;

}



message UsbDeviceAttachedActivities {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional android.content.ComponentNameProto activity = 1;

    repeated UsbDeviceFilterProto filters = 2;

}



message UsbAccessoryAttachedActivities {

    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional android.content.ComponentNameProto activity = 1;

    repeated UsbAccessoryFilterProto filters = 2;

}