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

Commit 012b86d4 authored by Kazuhiro Ondo's avatar Kazuhiro Ondo Committed by Wink Saville
Browse files

DataConnection was cleaned up too early if it's already disconnecting 

Fix one logic failure introduced in patch for bug 4901019.

Bug: 4970726
Change-Id: Ifc4071b1cbf0c19fbd8356d7dcc16f9df39d4b54
parent a2267451

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

+6 −6
Original line number Diff line number Diff line
@@ -788,6 +788,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
                        Message msg = obtainMessage(EVENT_DISCONNECT_DONE, apnContext);

                        apnContext.getDataConnection().tearDown(apnContext.getReason(), msg);

                        apnContext.setState(State.DISCONNECTING);

                    }

                } else {

                    // apn is connected but no reference to dcac.

                    // Should not be happen, but reset the state in case.
@@ -796,7 +797,6 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
                                                apnContext.getApnType());

                }

            }

            }

        } else {

            // force clean up the data connection.

            if (dcac != null) dcac.resetSync();