| commit | f0fb1e6e38b307867a86c8772b616aa118bd0db9 | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Tue Jun 20 02:07:45 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 20 02:07:45 2023 +0000 |
| tree | 873e50be269bf3dd0558af89c158629c40c9642e | |
| parent | 557fbbdf90e448c7cb62d7f9990a079255f951fe [diff] | |
| parent | 204765e5e53a9fda416f36e145e0c02401f6b80d [diff] |
Merge "Add idleTimer existence check before removing idleTimer" am: 40177cf4cb am: 204765e5e5 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2605753 Change-Id: Ib0bb1938e6f9ad7232213b96055ed4b6b324d04a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index f18b7d1..0635a3c 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java
@@ -11285,6 +11285,10 @@ updateRadioPowerState(false /* isActive */, type); synchronized (mActiveIdleTimers) { final IdleTimerParams params = mActiveIdleTimers.remove(iface); + if (params == null) { + // IdleTimer is not added if the configured timeout is 0 or negative value + return; + } // The call fails silently if no idle timer setup for this interface mNetd.idletimerRemoveInterface(iface, params.timeout, Integer.toString(params.transportType));