summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRavindra <c_rthat@codeaurora.org>2015-02-25 19:39:08 +0530
committerSandeep Kunta <skunta@codeaurora.org>2015-03-19 10:40:12 +0530
commit98b0d57c8d0eb73c8431b4c2f810cd37dae1a677 (patch)
tree2297895abefff8fe6714b6b7af9855edbbfb76b1
parent2a709e4698328496eae107055ae3ef2c4e0f605f (diff)
downloadandroid_packages_apps_InCallUI-98b0d57c8d0eb73c8431b4c2f810cd37dae1a677.tar.gz
android_packages_apps_InCallUI-98b0d57c8d0eb73c8431b4c2f810cd37dae1a677.tar.bz2
android_packages_apps_InCallUI-98b0d57c8d0eb73c8431b4c2f810cd37dae1a677.zip
Fix to prevent displaying incall screen when disconnected.
While checking for auto answered call do not perform the check in DISCONNECTED and DISCONNECTING state as it maps to INCALL state. Change-Id: Ied80911555f15c10a381f6c852736f69f41db156 Crs-Fixed: 800088
-rw-r--r--src/com/android/incallui/InCallPresenter.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/incallui/InCallPresenter.java b/src/com/android/incallui/InCallPresenter.java
index caef6e60..e30af55f 100644
--- a/src/com/android/incallui/InCallPresenter.java
+++ b/src/com/android/incallui/InCallPresenter.java
@@ -883,9 +883,13 @@ public class InCallPresenter implements CallList.Listener, InCallPhoneListener {
//If the call is auto answered bring up the InCallActivity
boolean isAutoAnswer = false;
- isAutoAnswer = (mInCallState == InCallState.INCOMING) &&
- (newState == InCallState.INCALL) &&
- (mInCallActivity == null);
+
+ if ((mCallList.getDisconnectedCall() == null) &&
+ (mCallList.getDisconnectingCall() == null)) {
+ isAutoAnswer = (mInCallState == InCallState.INCOMING) &&
+ (newState == InCallState.INCALL) &&
+ (mInCallActivity == null);
+ }
Log.d(this, "startOrFinishUi: " + isAutoAnswer);