| commit | 679dc23ebb31a54d3c5c4e161269abe3c5f851e5 | [log] [tgz] |
|---|---|---|
| author | Nancy Chen <nancychen@google.com> | Tue Nov 11 22:55:12 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 11 22:55:12 2014 +0000 |
| tree | 56ff1e0150073bb55474c5353620265ca46aa8e2 | |
| parent | a01b656e2f068646d787adb272377819871642a9 [diff] | |
| parent | d9d9e643755e325fdf5f2b5caa616c38a53e4c85 [diff] |
Merge "String resource edits for Telecomm" into lmp-mr1-dev
diff --git a/tests/src/com/android/server/telecom/testapps/TestConnectionService.java b/tests/src/com/android/server/telecom/testapps/TestConnectionService.java index a474213..8a97106 100644 --- a/tests/src/com/android/server/telecom/testapps/TestConnectionService.java +++ b/tests/src/com/android/server/telecom/testapps/TestConnectionService.java
@@ -77,7 +77,11 @@ public TestConference(Connection a, Connection b) { super(null); - + setCapabilities( + PhoneCapabilities.SUPPORT_HOLD | + PhoneCapabilities.HOLD | + PhoneCapabilities.MUTE | + PhoneCapabilities.MANAGE_CONFERENCE); addConnection(a); addConnection(b);