aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuchand Ghosh <suchan@codeaurora.org>2016-03-21 12:35:47 +0530
committerSteve Kondik <steve@cyngn.com>2016-07-02 10:55:01 -0700
commit8b477da8c8c30195b307303c392a857695ddc04e (patch)
treefb7ffead5be451ed1cf3c453731f28ddb6a0f040
parent0f88ef6b7d8f96d7fae7b628d71b6aece8d586ba (diff)
downloadandroid_frameworks_opt_telephony-8b477da8c8c30195b307303c392a857695ddc04e.tar.gz
android_frameworks_opt_telephony-8b477da8c8c30195b307303c392a857695ddc04e.tar.bz2
android_frameworks_opt_telephony-8b477da8c8c30195b307303c392a857695ddc04e.zip
IMS: Fix phone app crash at setOutgoingCallerIdDisplay().
Phone process crash due to duplicate callback received at GsmPhone when launch additional call settings and click on Caller ID->Hide number. Correct logic to receive messge EVENT_SET_CLIR_COMPLETE by the requested phone (GsmPhone or ImsPhone), not by both. Change-Id: Iec19577b7bf567c769089c40c05c656754b694ae CRs-Fixed: 990931
-rw-r--r--src/java/com/android/internal/telephony/gsm/GSMPhone.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/java/com/android/internal/telephony/gsm/GSMPhone.java b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
index accb4ee5a..e2624dad1 100644
--- a/src/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -1329,8 +1329,7 @@ public class GSMPhone extends PhoneBase {
ImsPhone imsPhone = mImsPhone;
if ((imsPhone != null)
&& (imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE)) {
- imsPhone.setOutgoingCallerIdDisplay(commandInterfaceCLIRMode,
- obtainMessage(EVENT_SET_CLIR_COMPLETE, commandInterfaceCLIRMode, 0, onComplete));
+ imsPhone.setOutgoingCallerIdDisplay(commandInterfaceCLIRMode, onComplete);
return;
}
// Packing CLIR value in the message. This will be required for