diff options
| author | Ravindra Thattahalli Javaraiah <c_rthat@codeaurora.org> | 2015-12-08 18:35:17 +0530 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-07-02 10:55:01 -0700 |
| commit | a9d7209ff06367252fdd827f4bac051c1a38ffb3 (patch) | |
| tree | eb24dcabba86311488b3e2a384994d66888ed6c6 | |
| parent | e93e6b5ade17936021e5ef69f4bd82c44cb701b8 (diff) | |
| download | android_frameworks_opt_telephony-a9d7209ff06367252fdd827f4bac051c1a38ffb3.tar.gz android_frameworks_opt_telephony-a9d7209ff06367252fdd827f4bac051c1a38ffb3.tar.bz2 android_frameworks_opt_telephony-a9d7209ff06367252fdd827f4bac051c1a38ffb3.zip | |
Notify disconnect on phone dispose
While disposing a phone object if there are any active connections then
notify disconnect to the registrants to update the ui.
Change-Id: I74a3d5c9e3919083a786df43053b2b70ad9deb15
CRs-Fixed: 954722
| -rw-r--r-- | src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java | 6 | ||||
| -rw-r--r-- | src/java/com/android/internal/telephony/gsm/GsmCallTracker.java | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java b/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java index b3ab17b8c..f10ecb1db 100644 --- a/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java +++ b/src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java @@ -1022,6 +1022,12 @@ public final class CdmaCallTracker extends CallTracker { if (!mPhone.mIsTheCurrentActivePhone) { Rlog.w(LOG_TAG, "Ignoring events received on inactive CdmaPhone"); + for (int i = 0; i < mConnections.length; i++) { + CdmaConnection conn = mConnections[i]; + if ((conn != null) && (conn.mCause != DisconnectCause.NOT_DISCONNECTED)) { + conn.onDisconnect(conn.mCause); + } + } return; } switch (msg.what) { diff --git a/src/java/com/android/internal/telephony/gsm/GsmCallTracker.java b/src/java/com/android/internal/telephony/gsm/GsmCallTracker.java index 185664204..0601002da 100644 --- a/src/java/com/android/internal/telephony/gsm/GsmCallTracker.java +++ b/src/java/com/android/internal/telephony/gsm/GsmCallTracker.java @@ -913,6 +913,12 @@ public final class GsmCallTracker extends CallTracker { if (!mPhone.mIsTheCurrentActivePhone) { Rlog.e(LOG_TAG, "Received message " + msg + "[" + msg.what + "] while being destroyed. Ignoring."); + for (int i = 0; i < mConnections.length; i++) { + GsmConnection conn = mConnections[i]; + if ((conn != null) && (conn.mCause != DisconnectCause.NOT_DISCONNECTED)) { + conn.onDisconnect(conn.mCause); + } + } return; } switch (msg.what) { |