commit b238ff2d0c7c6d159724817e333a9224bb0deed7
author Chiachang Wang <chiachangwang@google.com> Mon Jul 10 01:13:29 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 10 01:13:29 2023 +0000
tree ade20c756c028c04f9b7918e2d469073b6f85717
parent 6bdb7d5cbc40a94b721612b16478b3ccc74a2ce1
parent 2f59689124775a74486a543668b42bab1816244d

Merge "Duplicate the fd instead of reference" into main am: 2f59689124

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2651440

Change-Id: Ic89e84ac40c33354e7bceffaaad64a3b2a5cd288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;