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

Merge "Add unknown state in DataSubscriptionState enum" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-05-20 09:01:26 +00:00
committed by Android (Google) Code Review
parent 135779c8bd 8b794b7703
commit fe5aa41e27
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmds/statsd/src/atoms.proto
View File

@@ -4945,9 +4945,12 @@ message MobileBytesTransferByFgBg {
/** /**
* Used for pull network statistics via mobile|wifi networks, and sliced by interesting dimensions. * Used for pull network statistics via mobile|wifi networks, and sliced by interesting dimensions.
* Note that data is expected to be sliced into more dimensions in future. In other words, * Note that the data is expected to be sliced into more dimensions in future. In other words,
* the caller must not assume the data is unique when filtering with a set of matching conditions. * the caller must not assume any row of data is one full report when filtering with a set of
* Thus, as the dimension grows, the caller will not be affected. * matching conditions, because future data may represent with multiple rows what is currently
* represented by one.
* To avoid being broken by future slicing, callers must take care to aggregate rows even if they
* query all the existing columns.
* *
* Pulled from: * Pulled from:
* StatsPullAtomService (using NetworkStatsService to get NetworkStats) * StatsPullAtomService (using NetworkStatsService to get NetworkStats)
@@ -4972,21 +4975,26 @@ message DataUsageBytesTransfer {
optional int32 rat_type = 6; optional int32 rat_type = 6;
// Mcc/Mnc read from sim if the record is for a specific subscription, null indicates the // Mcc/Mnc read from sim if the record is for a specific subscription, null indicates the
// record is combined regardless of subscription. // record is combined across subscriptions.
optional string sim_mcc = 7; optional string sim_mcc = 7;
optional string sim_mnc = 8; optional string sim_mnc = 8;
// Allows mobile virtual network operators (MVNOs) to be identified with individual IDs.
// See TelephonyManager#getSimCarrierId.
optional int32 carrier_id = 9;
// Enumeration of opportunistic states with an additional ALL state indicates the record is // Enumeration of opportunistic states with an additional ALL state indicates the record is
// combined regardless of the boolean value in its field. // combined regardless of the boolean value in its field.
enum DataSubscriptionState { enum DataSubscriptionState {
UNKNOWN = 0; // For server side backward compatibility.
ALL = 1; ALL = 1;
OPPORTUNISTIC = 2; OPPORTUNISTIC = 2;
NOT_OPPORTUNISTIC = 3; NOT_OPPORTUNISTIC = 3;
} }
// Mark whether the subscription is an opportunistic data subscription, and ALL indicates the // Mark whether the subscription is an opportunistic data subscription, and ALL indicates the
// record is combined regardless of opportunistic data subscription. // record is combined across opportunistic data subscriptions.
// See {@link SubscriptionManager#setOpportunistic}. // See {@link SubscriptionManager#setOpportunistic}.
optional DataSubscriptionState opportunistic_data_sub = 9; optional DataSubscriptionState opportunistic_data_sub = 10;
} }
/** /**