commit 2f59689124775a74486a543668b42bab1816244d
author Chiachang Wang <chiachangwang@google.com> Mon Jul 10 00:27:20 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 10 00:27:20 2023 +0000
tree ade20c756c028c04f9b7918e2d469073b6f85717
parent f5025ba1a44f13dc803f98b16cf8ad80014d580a
parent 389a5fe16c9a0d6240ae171450ef8ac7443662e7

Merge "Duplicate the fd instead of reference" into main

service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java

diff --git a/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java b/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java
index 368860e..d03cac6 100644
--- a/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java
+++ b/service/src/com/android/server/connectivity/AutomaticOnOffKeepaliveTracker.java
@@ -495,8 +495,11 @@
         final AutomaticOnOffKeepalive autoKi;
         try {
             autoKi = target.withKeepaliveInfo(res.second);
-            // Close the duplicated fd.
-            target.close();
+            // Only automatic keepalives duplicate the fd.
+            if (target.mAutomaticOnOffState != STATE_ALWAYS_ON) {
+                // Close the duplicated fd.
+                target.close();
+            }
         } catch (InvalidSocketException e) {
             Log.wtf(TAG, "Fail to create AutomaticOnOffKeepalive", e);
             return;