diff options
| author | Etan Cohen <etancohen@google.com> | 2015-04-25 00:49:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-25 00:51:47 +0000 |
| commit | cd895cdf4dd98b4271e24742a6a46be70cda6382 (patch) | |
| tree | abe33abdc2107c5888acafde50bb23040c65f680 /telecomm/java/android/telecom/Call.java | |
| parent | 998ee16570e541e74e90eac39f468e6d8d1cd6f8 (diff) | |
| parent | 1418054108e3811db80e28496b335514b51b10f4 (diff) | |
| download | frameworks_base-cd895cdf4dd98b4271e24742a6a46be70cda6382.zip frameworks_base-cd895cdf4dd98b4271e24742a6a46be70cda6382.tar.gz frameworks_base-cd895cdf4dd98b4271e24742a6a46be70cda6382.tar.bz2 | |
Merge changes from topic 'mwd-merge-042415'
* changes:
Rename removeVideoCallListener to unregisterCallback
Bluetooth document fix: remove reference from open API to hidden entities
Fix build due to merge of 7595842 and renaming due to 8eb87f0
Merge commit '052a0da' into merge2
Merge commit 'db1dbb8' into merge2
Merge commit '7e5e791' into merge2
Merge commit '170102d' into merge2
Merge commit '4cb5d80' into merge2
Merge commit '83cda00' into merge2
Merge commit 'c91bc62' into merge2
Merge commit 'cffc360' into merge2
Merge commit '7f61051' into merge2
Merge commit '167c3a7' into merge2
Merge commit '4467b98' into merge2
Merge commit '25a217c' into merge2
Merge commit '04b18ec' into merge2
Merge commit '7595842' into merge2
Merge commit '2bbd2b6' into merge2
Merge commit '4890351' into merge2
Merge commit 'cd405fe' into merge2
Merge commit '6ddbb5e' into merge2
Merge commit 'de93575' into merge2
Merge commit '9561e74' into merge2
Diffstat (limited to 'telecomm/java/android/telecom/Call.java')
| -rw-r--r-- | telecomm/java/android/telecom/Call.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index 2a30384..d92c0c7 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -933,7 +933,8 @@ public final class Call { Collections.unmodifiableList(parcelableCall.getCannedSmsResponses()); } - boolean videoCallChanged = !Objects.equals(mVideoCall, parcelableCall.getVideoCall()); + boolean videoCallChanged = parcelableCall.isVideoCallProviderChanged() && + !Objects.equals(mVideoCall, parcelableCall.getVideoCall()); if (videoCallChanged) { mVideoCall = parcelableCall.getVideoCall(); } |