Merge "Expose post-dial APIs" into lmp-preview-dev

This commit is contained in:
Evan Charlton
2014-06-05 22:52:07 +00:00
committed by Android (Google) Code Review
8 changed files with 65 additions and 5 deletions

View File

@@ -146,7 +146,8 @@ public abstract class ConnectionService extends CallService {
}
} else {
addConnection(callInfo.getId(), result[0]);
Log.d(this, "adapter handleSuccessfulOutgoingCall %s", callInfo.getId());
Log.d(this, "adapter handleSuccessfulOutgoingCall %s",
callInfo.getId());
getAdapter().handleSuccessfulOutgoingCall(callInfo.getId());
}
}
@@ -288,6 +289,25 @@ public abstract class ConnectionService extends CallService {
// TODO(santoscordon): Find existing conference call and invoke split(connection).
}
@Override
public final void onPostDialContinue(String callId, boolean proceed) {
Log.d(this, "onPostDialContinue(%s)", callId);
Connection connection = findConnectionForAction(callId, "onPostDialContinue");
if (connection == NULL_CONNECTION) {
Log.w(this, "Connection missing in post-dial request %s.", callId);
return;
}
connection.onPostDialContinue(proceed);
}
@Override
public final void onPostDialWait(Connection conn, String remaining) {
Log.d(this, "onPostDialWait(%s, %s)", conn, remaining);
getAdapter().onPostDialWait(mIdByConnection.get(conn), remaining);
}
/**
* Find a set of Subscriptions matching a given handle (e.g. phone number).
*