| commit | 7a23977c573d1c95fe35d65b8ffe26291164810f | [log] [tgz] |
|---|---|---|
| author | Chiachang Wang <chiachangwang@google.com> | Mon Jul 10 03:19:59 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 10 03:19:59 2023 +0000 |
| tree | 93b64c50f3b6c01689532487a0f6910a44a6645f | |
| parent | ab2bfe5bc9b07e162ee2001eb03fcd46bb764899 [diff] | |
| parent | 1b4bff151d3785fba336a5505c5abee710ef4374 [diff] |
Merge "Duplicate the fd instead of reference" into main am: 2f59689124 am: b238ff2d0c am: b114e91d58 am: 1b4bff151d Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2651440 Change-Id: I8683c3bb4488ae138b05b5f1f690407196b772f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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;