Merge "Restored 'maxConnsTime' and 'maxConns' in data profile" am: bcb0c1b49a

am: 777d7abef3

Change-Id: Ie9f5fd2909773c9c066ab763f19e17d34f6f1e03
This commit is contained in:
Jack Yu 2018-10-15 18:55:19 -07:00 committed by android-build-merger
commit aa7c36789d

View file

@ -171,9 +171,9 @@ struct DataRegStateResult {
};
/**
* Overwritten from @1.0::DataProfileInfo in order to deprecate 'mvnoType', 'mvnoMatchData',
* 'maxConnsTime', and 'maxConns'. In the future, this must be extended instead of overwritten.
* Added 'preferred' and 'persistent' in this version.
* Overwritten from @1.0::DataProfileInfo in order to deprecate 'mvnoType', and 'mvnoMatchData'.
* In the future, this must be extended instead of overwritten.
* Also added 'preferred' and 'persistent' in this version.
*/
struct DataProfileInfo {
/** id of the data profile */
@ -206,6 +206,12 @@ struct DataProfileInfo {
/** Data profile technology type */
DataProfileInfoType type;
/** The period in seconds to limit the maximum connections */
int32_t maxConnsTime;
/** The maximum connections during maxConnsTime */
int32_t maxConns;
/**
* The required wait time in seconds after a successful UE initiated disconnect of a given PDN
* connection before the device can send a new PDN connection request for that given PDN.