| commit | d5c2fcf3bc8fc8ae08c05d7172e2244335c73e8f | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Mon Dec 01 17:28:22 2014 -0800 |
| committer | Andrew Lee <anwlee@google.com> | Tue Dec 02 12:00:14 2014 -0800 |
| tree | 077e3f778889e8fe314fca52fda3a47e84c26119 | |
| parent | 15a71555709aaf3574e8b39bebf022b5e6f75228 [diff] |
Fix connection <=> call capability conversion. Bug: 18583954 Bug: 18292176 Change-Id: I8c9b44375845fc802c2bffe32a575241a553e68d
diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java index 3810771..bc0e315 100644 --- a/src/com/android/server/telecom/InCallController.java +++ b/src/com/android/server/telecom/InCallController.java
@@ -588,7 +588,7 @@ int callCapabilities = 0; for (int i = 0; i < CONNECTION_TO_CALL_CAPABILITY.length; i += 2) { if ((CONNECTION_TO_CALL_CAPABILITY[i] & connectionCapabilities) != 0) { - callCapabilities &= CONNECTION_TO_CALL_CAPABILITY[i + 1]; + callCapabilities |= CONNECTION_TO_CALL_CAPABILITY[i + 1]; } } return callCapabilities;