diff options
| author | Evan Charlton <evanc@google.com> | 2014-05-14 12:35:47 -0700 |
|---|---|---|
| committer | Evan Charlton <evanc@google.com> | 2014-05-14 12:35:47 -0700 |
| commit | 9a14ded169ed23223d4e7e8e5412ae4cc33a31d3 (patch) | |
| tree | fcf802b80d487612465e7aec440dc184bc7faf44 /InCallUI/src/com/android/incallui/InCallApp.java | |
| parent | 63c7d7678ff56b7366e4508a39a2d79f8b28c917 (diff) | |
| parent | 248a6687e8075e9730217be73c54ee4f95501a0e (diff) | |
resolved conflicts for merge of fc22ba88 to master
Change-Id: I686eff26a8172fe289866046f3b0a3f2392628c2
Diffstat (limited to 'InCallUI/src/com/android/incallui/InCallApp.java')
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallApp.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/InCallUI/src/com/android/incallui/InCallApp.java b/InCallUI/src/com/android/incallui/InCallApp.java index 01bdf3bf1..759f391b8 100644 --- a/InCallUI/src/com/android/incallui/InCallApp.java +++ b/InCallUI/src/com/android/incallui/InCallApp.java @@ -63,9 +63,7 @@ public class InCallApp extends Application { final String action = intent.getAction(); Log.i(this, "Broadcast from Notification: " + action); - // TODO: Commands of this nature should exist in the CallList or a - // CallController class that has access to CallCommandClient and - // CallList. + // TODO: Commands of this nature should exist in the CallList. if (action.equals(ACTION_HANG_UP_ONGOING_CALL)) { InCallPresenter.getInstance().hangUpOngoingCall(context); } else if (action.equals(ACTION_ANSWER_INCOMING_CALL)) { |