summaryrefslogtreecommitdiffstats
path: root/telecomm/java/android/telecom/Call.java
diff options
context:
space:
mode:
authorRavindra <c_rthat@codeaurora.org>2015-10-07 17:00:57 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2015-10-08 00:01:50 -0700
commit1b2b754a3100c0aab4afffe5890276a3f91eb4cc (patch)
treed186bf9caef7c25cbcec663ac527ec6c7c172a1e /telecomm/java/android/telecom/Call.java
parent09ecabc3ea7a13d140a0c050afdafc6e9e2884a3 (diff)
downloadframeworks_base-1b2b754a3100c0aab4afffe5890276a3f91eb4cc.zip
frameworks_base-1b2b754a3100c0aab4afffe5890276a3f91eb4cc.tar.gz
frameworks_base-1b2b754a3100c0aab4afffe5890276a3f91eb4cc.tar.bz2
Fix to display merge icon on failure.
Trigger a state change to incallui with the existing state on an unsuccessful merge in order to enable merge icon. Change-Id: I1c7baa7a2c2ccf277eff06d68da0b419ae587a19 CRs-Fixed: 815642
Diffstat (limited to 'telecomm/java/android/telecom/Call.java')
-rw-r--r--telecomm/java/android/telecom/Call.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index 29f3061..7633daf 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -1169,6 +1169,11 @@ public final class Call {
}
}
+ /** {@hide} */
+ final void onMergeFailed() {
+ fireStateChanged(mState);
+ }
+
private void fireStateChanged(final int newState) {
for (CallbackRecord<Callback> record : mCallbackRecords) {
final Call call = this;