Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 452b77a4 authored by Junyu Lai's avatar Junyu Lai Committed by android-build-merger
Browse files

Merge "Notify upper layer when trying to stop non-existing keepalive" am:... 

Merge "Notify upper layer when trying to stop non-existing keepalive" am: 773a14b1 am: b4bb3ed9 am: 818f3672
am: 8c081f54

Change-Id: I54984b4b4b8dd8feacad1235dbb0c0992e86bbc6
parents 2791f22b 8c081f54

src/java/com/android/internal/telephony/dataconnection/DataConnection.java

+1 −0
Original line number Diff line number Diff line
@@ -2185,6 +2185,7 @@ public class DataConnection extends StateMachine { 
                    int handle = mNetworkAgent.keepaliveTracker.getHandleForSlot(slotId);

                    if (handle < 0) {

                        loge("No slot found for stopSocketKeepalive! " + slotId);

                        mNetworkAgent.onSocketKeepaliveEvent(slotId, SocketKeepalive.NO_KEEPALIVE);

                        retVal = HANDLED;

                        break;

                    } else {