| commit | a1df998fe48e03869495f2fc5489b77c96650c88 | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Tue Jun 20 03:47:16 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 20 03:47:16 2023 +0000 |
| tree | be259a781f8bf5f3ebcc5d602d990b548c70bffe | |
| parent | c7ed6dc9a82afa73cfcf7ddd06d3c0bb64684dc8 [diff] | |
| parent | 2ea33a84e8c0bdeea61df779c1c8f72250b497b8 [diff] |
Merge "Add idleTimer existence check before removing idleTimer" am: 40177cf4cb am: 204765e5e5 am: f0fb1e6e38 am: 2ea33a84e8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2605753 Change-Id: Ia95b3a22e02636ee70ae57aa9a03041dafb83a12 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 5b91da2..c122640 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java
@@ -11290,6 +11290,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));