diff options
| author | Kuen Yuet Cheung <kuenyuet@google.com> | 2023-11-29 08:03:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-29 08:03:25 +0000 |
| commit | 6aefc04727586c557e7fd224ca7a829bcbbcb7f9 (patch) | |
| tree | bc2c4ffec028e2fde0c11cf527d02e04f47bc5fc | |
| parent | ccfec1cd0eca0f4f1ebf51d30ef345ac6bdbc315 (diff) | |
| parent | 2234c8e3ac7e83b285d027d4f4a1f5dc5fd67023 (diff) | |
| download | Iwlan-6aefc04727586c557e7fd224ca7a829bcbbcb7f9.tar.gz | |
Merge "Refactor PolicyDerivedRetryAction creation" into main am: 8089b1e092 am: 2234c8e3ac
Original change: https://android-review.googlesource.com/c/platform/packages/services/Iwlan/+/2842717
Change-Id: I3d7d5ec4a04193353ecbbe83b6af91bd50d9ebc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/google/android/iwlan/ErrorPolicyManager.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/com/google/android/iwlan/ErrorPolicyManager.java b/src/com/google/android/iwlan/ErrorPolicyManager.java index 5ce0877..b508e7d 100644 --- a/src/com/google/android/iwlan/ErrorPolicyManager.java +++ b/src/com/google/android/iwlan/ErrorPolicyManager.java @@ -1226,16 +1226,14 @@ public class ErrorPolicyManager { @Nullable RetryAction prevRetryAction = mLastRetryActionByCause.get(errorCause); boolean shouldAccumulateRetryIndex = shouldAccumulateRetryIndex(prevRetryAction, iwlanError); + int newRetryIndex = + shouldAccumulateRetryIndex + ? ((PolicyDerivedRetryAction) prevRetryAction).currentRetryIndex() + 1 + : 0; ErrorPolicy policy = findErrorPolicy(mApn, iwlanError); PolicyDerivedRetryAction newRetryAction = - shouldAccumulateRetryIndex - ? PolicyDerivedRetryAction.create( - iwlanError, - policy, - ((PolicyDerivedRetryAction) prevRetryAction).currentRetryIndex() - + 1) - : PolicyDerivedRetryAction.create(iwlanError, policy, 0); + PolicyDerivedRetryAction.create(iwlanError, policy, newRetryIndex); mLastRetryActionByCause.put(errorCause, newRetryAction); mLastRetryAction = newRetryAction; |