Merge "Add idleTimer existence check before removing idleTimer"

2023-06-20 00:45:03 +00:00
parent df9a2d7e20 00ccb51aa3
commit 40177cf4cb
1 changed files with 4 additions and 0 deletions
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -11285,6 +11285,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
                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));