Merge "Add idleTimer existence check before removing idleTimer" am: 40177cf4cb am: 204765e5e5 am: f0fb1e6e38

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2605753

Change-Id: I4e3c21dcae0ff5d10e9f6e6b44f22a8a7194b47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Motomu Utsumi 2023-06-20 02:58:32 +00:00 • committed by Automerger Merge Worker
commit 2ea33a84e8

View file

@ -11290,6 +11290,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));