commit 40177cf4cb79d68c2e1ceff9e0afdbb0d5a322a0
author Motomu Utsumi <motomuman@google.com> Tue Jun 20 00:45:03 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 20 00:45:03 2023 +0000
tree b5a7e40738e2cacccacab62811083c03a82ff936
parent df9a2d7e200a8d6384cf874a5437f6f86196cac5
parent 00ccb51aa394a570c63cdec2a45723b17ff2a87c

Merge "Add idleTimer existence check before removing idleTimer"

service/src/com/android/server/ConnectivityService.java

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));