diff options
| author | Andrew Lee <anwlee@google.com> | 2015-06-09 22:13:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-09 22:13:14 +0000 |
| commit | cad339992e391a5b57b6ed6e7e73e2633a99fc70 (patch) | |
| tree | fc87306a9feb0c8589b96ef13527c04b037a18dd | |
| parent | 400a1eb1a7f06ece32600fba2a5e7e18f22c91c8 (diff) | |
| parent | bcd9e1b8c968d4794e67689b4ec497535fd87da9 (diff) | |
am bcd9e1b8: am f0a6dbff: am 12dc8d0c: Merge "Get rid of some now-unused VM code." into mnc-dev
* commit 'bcd9e1b8c968d4794e67689b4ec497535fd87da9':
Get rid of some now-unused VM code.
| -rw-r--r-- | src/com/android/dialer/CallDetailActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/dialer/calllog/IntentProvider.java | 19 |
2 files changed, 0 insertions, 21 deletions
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java index 87ec774a8..15ba5df16 100644 --- a/src/com/android/dialer/CallDetailActivity.java +++ b/src/com/android/dialer/CallDetailActivity.java @@ -77,8 +77,6 @@ public class CallDetailActivity extends Activity { public static final String EXTRA_CALL_LOG_IDS = "EXTRA_CALL_LOG_IDS"; /** If we are started with a voicemail, we'll find the uri to play with this extra. */ public static final String EXTRA_VOICEMAIL_URI = "EXTRA_VOICEMAIL_URI"; - /** If we should immediately start playback of the voicemail, this extra will be set to true. */ - public static final String EXTRA_VOICEMAIL_START_PLAYBACK = "EXTRA_VOICEMAIL_START_PLAYBACK"; /** If the activity was triggered from a notification. */ public static final String EXTRA_FROM_NOTIFICATION = "EXTRA_FROM_NOTIFICATION"; diff --git a/src/com/android/dialer/calllog/IntentProvider.java b/src/com/android/dialer/calllog/IntentProvider.java index d7a35e8ad..a11d00bc2 100644 --- a/src/com/android/dialer/calllog/IntentProvider.java +++ b/src/com/android/dialer/calllog/IntentProvider.java @@ -83,24 +83,6 @@ public abstract class IntentProvider { }; } - public static IntentProvider getPlayVoicemailIntentProvider(final long rowId, - final String voicemailUri) { - return new IntentProvider() { - @Override - public Intent getIntent(Context context) { - Intent intent = new Intent(context, CallDetailActivity.class); - intent.setData(ContentUris.withAppendedId( - Calls.CONTENT_URI_WITH_VOICEMAIL, rowId)); - if (voicemailUri != null) { - intent.putExtra(CallDetailActivity.EXTRA_VOICEMAIL_URI, - Uri.parse(voicemailUri)); - } - intent.putExtra(CallDetailActivity.EXTRA_VOICEMAIL_START_PLAYBACK, true); - return intent; - } - }; - } - public static IntentProvider getSendSmsIntentProvider(final String number) { return new IntentProvider() { @Override @@ -129,7 +111,6 @@ public abstract class IntentProvider { intent.putExtra(CallDetailActivity.EXTRA_VOICEMAIL_URI, Uri.parse(voicemailUri)); } - intent.putExtra(CallDetailActivity.EXTRA_VOICEMAIL_START_PLAYBACK, false); if (extraIds != null && extraIds.length > 0) { intent.putExtra(CallDetailActivity.EXTRA_CALL_LOG_IDS, extraIds); |