Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c7656bb authored by Daniel Bright's avatar Daniel Bright Committed by Automerger Merge Worker
Browse files

Merge changes from topic "iwlan_pdu_session_second_commit" am: 08e53879 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1580687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I428e9f8c47a368ceb0a7e22a2779a90586df2082
parents 8d41480a 08e53879

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

+5 −1
Original line number Diff line number Diff line
@@ -2114,7 +2114,11 @@ public class DataConnection extends StateMachine { 
                        loge("EVENT_ALLOCATE_PDU_SESSION_ID: asyncResult is null!");

                    } else {

                        Consumer<Integer> onAllocated = (Consumer<Integer>) asyncResult.userObj;

                        if (asyncResult.result == null) {

                        if (asyncResult.exception != null) {

                            loge("EVENT_ALLOCATE_PDU_SESSION_ID: exception",

                                    asyncResult.exception);

                            onAllocated.accept(PDU_SESSION_ID_NOT_SET);

                        } else if (asyncResult.result == null) {

                            loge("EVENT_ALLOCATE_PDU_SESSION_ID: result null, no id");

                            onAllocated.accept(PDU_SESSION_ID_NOT_SET);

                        } else {