LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Remove dead KeepaliveInfo if it cannot be started"

Browse Source 
am: 8e1e64f928

Change-Id: I7ec41627065d21d025370905257483738ee04c42
This commit is contained in:
Junyu Lai
2019-01-20 20:09:51 -08:00
committed by android-build-merger
parent 39ac4fe5bf 8e1e64f928
commit e2c006f40b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/connectivity/KeepaliveTracker.java
View File

@@ -185,13 +185,13 @@ public class KeepaliveTracker {
} }
void start(int slot) { void start(int slot) {
mSlot = slot;
int error = isValid(); int error = isValid();
if (error == SUCCESS) { if (error == SUCCESS) {
mSlot = slot;
Log.d(TAG, "Starting keepalive " + mSlot + " on " + mNai.name()); Log.d(TAG, "Starting keepalive " + mSlot + " on " + mNai.name());
mNai.asyncChannel.sendMessage(CMD_START_PACKET_KEEPALIVE, slot, mInterval, mPacket); mNai.asyncChannel.sendMessage(CMD_START_PACKET_KEEPALIVE, slot, mInterval, mPacket);
} else { } else {
notifyMessenger(NO_KEEPALIVE, error); handleStopKeepalive(mNai, mSlot, error);
return; return;
} }
} }
@@ -277,6 +277,7 @@ public class KeepaliveTracker {
return; return;
} }
ki.stop(reason); ki.stop(reason);
Log.d(TAG, "Stopped keepalive " + slot + " on " + networkName);
networkKeepalives.remove(slot); networkKeepalives.remove(slot);
if (networkKeepalives.isEmpty()) { if (networkKeepalives.isEmpty()) {
mKeepalives.remove(nai); mKeepalives.remove(nai);