commit 23ff4d4549779628a4c1eb8a7f5002a18cadde8d
author Aswin Sankar <apsankar@google.com> Thu May 19 19:29:26 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu May 19 19:29:26 2022 +0000
tree fe6df523e4594f216b6ed400f5a724746ef96a9b
parent d9b603460c4466f638fa9e6be9f3cda48952233b
parent d103660cb9743b57d5d0f88f134e077972dfb8df

Update default retry policy for IKE_AUTH error 24 am: d103660cb9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Iwlan/+/18486359

Change-Id: I4ddd4654bcbd0aebc95de32b8e27a2ed26836cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

assets/defaultiwlanerrorconfig.json

diff --git a/assets/defaultiwlanerrorconfig.json b/assets/defaultiwlanerrorconfig.json
index 07b980d..eae1ae2 100644
--- a/assets/defaultiwlanerrorconfig.json
+++ b/assets/defaultiwlanerrorconfig.json
@@ -72,6 +72,12 @@
         "ErrorDetails": ["IO_EXCEPTION"],
         "RetryArray": ["0", "0", "0", "60+r15", "120", "-1"],
         "UnthrottlingEvents": ["APM_ENABLE_EVENT", "APM_DISABLE_EVENT", "WIFI_DISABLE_EVENT", "WIFI_AP_CHANGED_EVENT"]
+      },
+      {
+        "ErrorType": "IKE_PROTOCOL_ERROR_TYPE",
+        "ErrorDetails": ["24"],
+        "RetryArray": ["10", "20", "40", "80", "160"],
+        "UnthrottlingEvents": ["APM_ENABLE_EVENT", "WIFI_DISABLE_EVENT", "WIFI_CALLING_DISABLE_EVENT"]
       }
     ]
   }

test/com/google/android/iwlan/ErrorPolicyManagerTest.java

diff --git a/test/com/google/android/iwlan/ErrorPolicyManagerTest.java b/test/com/google/android/iwlan/ErrorPolicyManagerTest.java
index 718a875..3bc624b 100644
--- a/test/com/google/android/iwlan/ErrorPolicyManagerTest.java
+++ b/test/com/google/android/iwlan/ErrorPolicyManagerTest.java
@@ -191,7 +191,7 @@
     }
 
     @Test
-    public void testInvalidCarrierConfig() throws Exception {
+    public void testDefaultPolicyFallback() throws Exception {
         String apn = "ims";
         String config =
                 "[{"
@@ -217,17 +217,21 @@
 
         sleep(1000);
 
-        // IKE_PROTOCOL_ERROR_TYPE(24) and retryArray = 5, 10, 15 as it will fallback due to failed
-        // parsing
+        // Fallback to default Iwlan error policy for IKE_PROTOCOL_ERROR_TYPE(24) because of failed
+        // parsing (or lack of explicit carrier-defined policy).
         IwlanError iwlanError = buildIwlanIkeAuthFailedError();
         long time = mErrorPolicyManager.reportIwlanError(apn, iwlanError);
-        assertEquals(5, time);
-        time = mErrorPolicyManager.reportIwlanError(apn, iwlanError);
         assertEquals(10, time);
         time = mErrorPolicyManager.reportIwlanError(apn, iwlanError);
-        assertEquals(10, time);
+        assertEquals(20, time);
         time = mErrorPolicyManager.reportIwlanError(apn, iwlanError);
-        assertEquals(10, time);
+        assertEquals(40, time);
+        time = mErrorPolicyManager.reportIwlanError(apn, iwlanError);
+        assertEquals(80, time);
+        time = mErrorPolicyManager.reportIwlanError(apn, iwlanError);
+        assertEquals(160, time);
+        time = mErrorPolicyManager.reportIwlanError(apn, iwlanError);
+        assertEquals(86400, time);
     }
 
     @Test