summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2014-04-15 22:59:19 -0600
committerLinux Build Service Account <lnxbuild@localhost>2014-04-15 22:59:19 -0600
commit82264565573f70d8547189182e7cf1841441a0e8 (patch)
tree8cd502ca04bf377b833af55dc90b45147ecdfb98
parentff29e96047e27d54e1f1bc32bdc6b492d1dbb0c4 (diff)
parent6616a11f1ad694f796193037e9b0ee26c70af2a1 (diff)
downloadandroid_packages_apps_InCallUI-82264565573f70d8547189182e7cf1841441a0e8.tar.gz
android_packages_apps_InCallUI-82264565573f70d8547189182e7cf1841441a0e8.tar.bz2
android_packages_apps_InCallUI-82264565573f70d8547189182e7cf1841441a0e8.zip
Merge 6616a11f1ad694f796193037e9b0ee26c70af2a1 on remote branch
Change-Id: I2f66e9e21520cae7b189d3a395967d6989daae76
-rw-r--r--src/com/android/incallui/CallList.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/incallui/CallList.java b/src/com/android/incallui/CallList.java
index 9b942ed1..6a3c8521 100644
--- a/src/com/android/incallui/CallList.java
+++ b/src/com/android/incallui/CallList.java
@@ -109,6 +109,10 @@ public class CallList {
public void onIncoming(Call call, List<String> textMessages) {
Log.d(this, "onIncoming - " + call);
+ // ensure the ringing call is active subscription, since phone state
+ // changed is notified before new incoming call ringing, and the event
+ // will switch active sub to a wrong sub(which is not ringing)
+ CallCommandClient.getInstance().setActiveSubscription(call.getSubscription());
updateActiveSuscription();
updateCallInMap(call);