From cded3beaf28a703e1ef8f71bbc6836e6806c3736 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Fri, 9 Jun 2017 14:16:05 +0000 Subject: Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47" This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44. Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master. Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b --- .../app/voicemail/LegacyVoicemailNotificationReceiver.java | 13 ++----------- .../dialer/app/voicemail/VoicemailPlaybackPresenter.java | 4 +--- .../dialer/app/voicemail/error/res/values-hi/strings.xml | 2 +- 3 files changed, 4 insertions(+), 15 deletions(-) (limited to 'java/com/android/dialer/app/voicemail') diff --git a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java index ffbae71f2..9d07ec561 100644 --- a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java +++ b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java @@ -43,15 +43,6 @@ public class LegacyVoicemailNotificationReceiver extends BroadcastReceiver { private static final String LEGACY_VOICEMAIL_COUNT = "legacy_voicemail_count"; - /** - * Hidden extra for {@link TelephonyManager#ACTION_SHOW_VOICEMAIL_NOTIFICATION} for whether the - * notification is just a refresh or for a new voicemail. The phone should not play a ringtone or - * vibrate during a refresh if the notification is already showing. - * - *

TODO(b/62202833): make public - */ - private static final String EXTRA_IS_REFRESH = "is_refresh"; - @Override public void onReceive(Context context, Intent intent) { LogUtil.i( @@ -60,6 +51,7 @@ public class LegacyVoicemailNotificationReceiver extends BroadcastReceiver { PhoneAccountHandle phoneAccountHandle = Assert.isNotNull(intent.getParcelableExtra(TelephonyManager.EXTRA_PHONE_ACCOUNT_HANDLE)); + int count = intent.getIntExtra(TelephonyManager.EXTRA_NOTIFICATION_COUNT, -1); if (!hasVoicemailCountChanged(context, phoneAccountHandle, count)) { @@ -105,8 +97,7 @@ public class LegacyVoicemailNotificationReceiver extends BroadcastReceiver { count, voicemailNumber, callVoicemailIntent, - voicemailSettingIntent, - intent.getBooleanExtra(EXTRA_IS_REFRESH, false)); + voicemailSettingIntent); } private static boolean hasVoicemailCountChanged( diff --git a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java index 686e3e8c4..ea48c8321 100644 --- a/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java +++ b/java/com/android/dialer/app/voicemail/VoicemailPlaybackPresenter.java @@ -548,9 +548,7 @@ public class VoicemailPlaybackPresenter mView.setClipPosition(mPosition, mDuration.get()); mView.enableUiElements(); mView.setSuccess(); - if (!mp.isPlaying()) { - mMediaPlayer.seekTo(mPosition); - } + mMediaPlayer.seekTo(mPosition); if (mIsPlaying) { resumePlayback(); diff --git a/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml index fb1b18621..bc9c46331 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values-hi/strings.xml @@ -55,7 +55,7 @@ "पिन सेट करें" "पुन: प्रयास करें" "चालू करें" - "रहने दें" + "नहीं धन्यवाद" "समन्वयित करें" "वॉइसमेल को कॉल करें" "ग्राहक सहायता को कॉल करें" -- cgit v1.2.3