| commit | 204765e5e53a9fda416f36e145e0c02401f6b80d | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Tue Jun 20 01:26:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 20 01:26:23 2023 +0000 |
| tree | b5a7e40738e2cacccacab62811083c03a82ff936 | |
| parent | b3f309ca245c5dd3a8f663b3463860040792cb4d [diff] | |
| parent | 40177cf4cb79d68c2e1ceff9e0afdbb0d5a322a0 [diff] |
Merge "Add idleTimer existence check before removing idleTimer" am: 40177cf4cb Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2605753 Change-Id: I950d4b79acc513e9194e352da6f62eb13ea13c9e 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));