From b780cb914e8ae07da39e771539c73bc915ac2e7c Mon Sep 17 00:00:00 2001
From: twyen <twyen@google.com>
Date: Mon, 21 May 2018 14:44:52 -0700
Subject: Ignore dialer OMTP VVM error if VVM is disabled

The status will be stale.

TEST=TAP
Bug: 78831353
Test: TAP
PiperOrigin-RevId: 197462056
Change-Id: Iaeeae9007f6b5ad8319889a860fdcce782be8a0d
---
 .../android/dialer/app/calllog/VisualVoicemailCallLogFragment.java    | 4 ++--
 java/com/android/dialer/app/voicemail/VoicemailErrorManager.java      | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'java/com/android/dialer/app')

diff --git a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
index dba43a2f7..5b6eb0387 100644
--- a/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
+++ b/java/com/android/dialer/app/calllog/VisualVoicemailCallLogFragment.java
@@ -182,10 +182,10 @@ public class VisualVoicemailCallLogFragment extends CallLogFragment {
   }
 
   @VisibleForTesting
-  static boolean shouldAutoSync(
+  boolean shouldAutoSync(
       VoicemailErrorMessageCreator errorMessageCreator, List<VoicemailStatus> statuses) {
     for (VoicemailStatus status : statuses) {
-      if (!status.isActive()) {
+      if (!status.isActive(getContext())) {
         continue;
       }
       if (errorMessageCreator.isSyncBlockingError(status)) {
diff --git a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
index ffaf16d18..a441e7986 100644
--- a/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
+++ b/java/com/android/dialer/app/voicemail/VoicemailErrorManager.java
@@ -86,9 +86,11 @@ public class VoicemailErrorManager implements CallLogQueryHandler.Listener, Voic
     List<VoicemailStatus> statuses = new ArrayList<>();
     while (statusCursor.moveToNext()) {
       VoicemailStatus status = new VoicemailStatus(context, statusCursor);
-      if (status.isActive()) {
+      if (status.isActive(context)) {
         statuses.add(status);
         addServiceStateListener(status);
+      } else {
+        LogUtil.i("VisualVoicemailCallLogFragment.shouldAutoSync", "inactive source ignored");
       }
     }
     alertItem.updateStatus(statuses, this);
-- 
cgit v1.2.3