summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorSailesh Nepal <sail@google.com>2014-05-14 19:36:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-14 19:36:27 +0000
commitd91760ea26ec2883bcc11175aad8db89cc601c68 (patch)
tree6598ea3a7ec2ca78f57c0d7ed33c4aa7ecd558a1 /InCallUI
parentece678e33aca03753b59d534e789e5f6075750a1 (diff)
parentcb3339e8a8177dd9c98fdd04198f089b2bddf556 (diff)
am 6e017333: Address comments about post dial
* commit '6e017333e59cb26bc914c6d77798a97d8c789d68': Address comments about post dial
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/src/com/android/incallui/InCallServiceImpl.java2
-rw-r--r--InCallUI/src/com/android/incallui/PostCharDialogFragment.java2
-rw-r--r--InCallUI/src/com/android/incallui/TelecommAdapter.java8
3 files changed, 7 insertions, 5 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallServiceImpl.java b/InCallUI/src/com/android/incallui/InCallServiceImpl.java
index 5ea3c47f8..a81369906 100644
--- a/InCallUI/src/com/android/incallui/InCallServiceImpl.java
+++ b/InCallUI/src/com/android/incallui/InCallServiceImpl.java
@@ -125,13 +125,11 @@ public class InCallServiceImpl extends android.telecomm.InCallService {
/** {@inheritDoc} */
@Override protected void setPostDial(String callId, String remaining) {
// TODO(ihab): Add post-dial state to user interface
- // TODO(ihab: Do the equivalent in the new framework:
}
/** {@inheritDoc} */
@Override protected void setPostDialWait(String callId, String remaining) {
// TODO(ihab): Add post-dial state to user interface
- // TODO(ihab): Do the equivalent in the new framework:
}
/** {@inheritDoc} */
diff --git a/InCallUI/src/com/android/incallui/PostCharDialogFragment.java b/InCallUI/src/com/android/incallui/PostCharDialogFragment.java
index be7b2ec19..275042559 100644
--- a/InCallUI/src/com/android/incallui/PostCharDialogFragment.java
+++ b/InCallUI/src/com/android/incallui/PostCharDialogFragment.java
@@ -52,7 +52,7 @@ public class PostCharDialogFragment extends DialogFragment {
builder.setPositiveButton(R.string.pause_prompt_yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int whichButton) {
- TelecommAdapter.getInstance().postDialWaitContinue(mCallId);
+ TelecommAdapter.getInstance().postDialContinue(mCallId);
}
});
builder.setNegativeButton(R.string.pause_prompt_no, new DialogInterface.OnClickListener() {
diff --git a/InCallUI/src/com/android/incallui/TelecommAdapter.java b/InCallUI/src/com/android/incallui/TelecommAdapter.java
index 67f5fc1bc..1bc581b88 100644
--- a/InCallUI/src/com/android/incallui/TelecommAdapter.java
+++ b/InCallUI/src/com/android/incallui/TelecommAdapter.java
@@ -130,8 +130,12 @@ final class TelecommAdapter {
}
}
- void postDialWaitContinue(String callId) {
- Log.wtf(this, "postDialWaitContinue not implemented");
+ void postDialContinue(String callId) {
+ if (mAdapter != null) {
+ mAdapter.postDialContinue(callId);
+ } else {
+ Log.e(this, "error postDialContinue, mAdapter is null");
+ }
}
void postDialCancel(String callId) {