Upgrade IkeLivenessCheckSessionValidated to v1.1
- Deprecated IkeTask in IkeLivenessCheckSessionValidated to use
more precise IKE state
- Added IkeState instead
- Added a new STATE_IKE_DPD_ON_DEMAND_LOCAL_INFO in IkeState for
on-demand DPD
eldar: eldar/504706225 v1.1
Bug: 325148948
Bug: 309087656
Test: manually tested
Change-Id: I9e8b7fa48fd9795ed81d7f9dcf064c18dbca2a9e
diff --git a/stats/atoms/ike/ike_extension_atoms.proto b/stats/atoms/ike/ike_extension_atoms.proto
index 2661276..bedc8a0 100644
--- a/stats/atoms/ike/ike_extension_atoms.proto
+++ b/stats/atoms/ike/ike_extension_atoms.proto
@@ -57,7 +57,8 @@
optional android.stats.ike.IkeCaller ike_caller = 1;
// To determine task at which liveness check was initiated.
- optional android.stats.ike.IkeTask ike_task = 2;
+ // Deprecated: use IkeState instead to use more precise IKE state
+ optional android.stats.ike.IkeTask ike_task = 2 [deprecated = true];
// Underlying network type that checked the Liveness.
optional android.stats.ike.IkeUnderlyingNetworkType ike_underlying_network_type = 3;
@@ -71,5 +72,8 @@
// True if the Liveness check is successful. False if the Liveness check is failed.
optional bool result_success = 6;
+
+ // To determine the state at which liveness check was initiated.
+ optional android.stats.ike.IkeState ike_state = 7;
}
diff --git a/stats/enums/stats/ike/ike.proto b/stats/enums/stats/ike/ike.proto
index 5ca01f2..5bb29d5 100644
--- a/stats/enums/stats/ike/ike.proto
+++ b/stats/enums/stats/ike/ike.proto
@@ -50,6 +50,7 @@
STATE_IKE_DELETE_LOCAL_DELETE = 17;
STATE_IKE_DPD_LOCAL_INFO = 18;
STATE_IKE_MOBIKE_LOCAL_INFO = 19;
+ STATE_IKE_DPD_ON_DEMAND_LOCAL_INFO = 20;
STATE_CHILD_KILL = 101;
STATE_CHILD_INITIAL = 102;
@@ -106,6 +107,7 @@
ERROR_PROTOCOL_CHILD_SA_NOT_FOUND= 0x0004002C;
}
+// Deprecated. Use IkeState instead.
enum IkeTask {
IKE_TASK_UNSPECIFIED = 0;
IKE_TASK_ON_DEMAND_DPD = 1;
