Merge "Fix test to set call ID for connection request"
diff --git a/src/com/android/telecomm/ConnectionServiceWrapper.java b/src/com/android/telecomm/ConnectionServiceWrapper.java
index 0ae8d20..00eb6d5 100644
--- a/src/com/android/telecomm/ConnectionServiceWrapper.java
+++ b/src/com/android/telecomm/ConnectionServiceWrapper.java
@@ -112,7 +112,7 @@
case MSG_HANDLE_FAILED_OUTGOING_CALL: {
SomeArgs args = (SomeArgs) msg.obj;
try {
- ConnectionRequest request = (ConnectionRequest) msg.obj;
+ ConnectionRequest request = (ConnectionRequest) args.arg1;
int statusCode = args.argi1;
String statusMsg = (String) args.arg2;
// TODO(santoscordon): Do something with 'reason' or get rid of it.
@@ -507,7 +507,7 @@
private void addConnectionServiceAdapter(IConnectionServiceAdapter adapter) {
if (isServiceValid("addConnectionServiceAdapter")) {
try {
- logOutgoing("addConnectionServiceAdapter%s", adapter);
+ logOutgoing("addConnectionServiceAdapter %s", adapter);
mServiceInterface.addConnectionServiceAdapter(adapter);
} catch (RemoteException e) {
}