commit 6f38aca593eb6402e8e3055d9a4c63d8331a6407
author Jack Yu <jackyu@google.com> Thu May 05 16:05:58 2022 -0700
committer Jack Yu <jackyu@google.com> Thu May 05 16:12:52 2022 -0700
tree 171195f84e8892109567abf3a96aa81d74384e5d
parent 4b8dc36947c32aa08e9bf999774912e4c12c8caa

Release PDU session id when setup data call fails

When setup data call fails on IWLAN, we should release
the PDU session id.

Fix: 230283098
Test: Manual
Change-Id: I0687d0f9c3b2b4bcd39e92a1dca6a1bbcaf3c712

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

diff --git a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
index 348908a..255972a 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DataConnection.java
@@ -2703,6 +2703,12 @@
                     }
                     ApnContext.requestLog(
                             cp.mApnContext, "onSetupConnectionCompleted result=" + result);
+
+                    if (result != SetupResult.SUCCESS) {
+                        releasePduSessionId(() -> DataConnection.this
+                                .setPduSessionId(PDU_SESSION_ID_NOT_SET));
+                    }
+
                     switch (result) {
                         case SUCCESS:
                             // All is well