commit d50f951340aca57c52f39e8bf1a8d1df8b504f2e
author chiachangwang <chiachangwang@google.com> Tue Jan 31 06:56:13 2023 +0000
committer chiachangwang <chiachangwang@google.com> Tue Jan 31 07:53:11 2023 +0000
tree dc86f40976da3ad98a81f40534d79f52fbd58bf5
parent 05600c129ed8ff319fb84e2f1a1c58473cb69774

[DK2-3]Do not attemp to stop keepalive on nonexistent network

Bug: 266771129
Test: atest FrameworksNetTests
Change-Id: I42cfe0720eddac70d76abbb340ea427f2d714c3a

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index cd4421b..330a1da 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -5576,6 +5576,10 @@
                 // Sent by KeepaliveTracker to process an app request on the state machine thread.
                 case NetworkAgent.CMD_STOP_SOCKET_KEEPALIVE: {
                     NetworkAgentInfo nai = getNetworkAgentInfoForNetwork((Network) msg.obj);
+                    if (nai == null) {
+                        Log.e(TAG, "Attempt to stop keepalive on nonexistent network");
+                        return;
+                    }
                     int slot = msg.arg1;
                     int reason = msg.arg2;
                     mKeepaliveTracker.handleStopKeepalive(nai, slot, reason);