joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Add idleTimer existence check before removing idleTimer"

Browse source
This commit is contained in:
Motomu Utsumi 2023-06-20 00:45:03 +00:00 • committed by Gerrit Code Review
commit 40177cf4cb
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
service/src/com/android/server/ConnectivityService.java
View file

@ -11285,6 +11285,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
updateRadioPowerState(false /* isActive */, type); updateRadioPowerState(false /* isActive */, type);
synchronized (mActiveIdleTimers) { synchronized (mActiveIdleTimers) {
final IdleTimerParams params = mActiveIdleTimers.remove(iface); 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 // The call fails silently if no idle timer setup for this interface
mNetd.idletimerRemoveInterface(iface, params.timeout, mNetd.idletimerRemoveInterface(iface, params.timeout,
Integer.toString(params.transportType)); Integer.toString(params.transportType));