Merge changes I99476bb2,Ie58a4c14

* changes:
  Guard VoicemailClientReceiver when VVM module is disabled
  Improve GoogleCallLogAdapterTest to better emulate reality

2 files changed, 13 insertions, 0 deletions

diff --git a/java/com/android/dialer/callintent/CallIntentBuilder.java b/java/com/android/dialer/callintent/CallIntentBuilder.java
index e5449c804..36ea907ff 100644
--- a/java/com/android/dialer/callintent/CallIntentBuilder.java
+++ b/java/com/android/dialer/callintent/CallIntentBuilder.java
@@ -160,4 +160,11 @@ public class CallIntentBuilder {
   public static int getLightbringerButtonAppearInSearchCount() {
     return lightbringerButtonAppearInSearchCount;
   }
+
+  @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+  public static void clearLightbringerCounts() {
+    lightbringerButtonAppearInCollapsedCallLogItemCount = 0;
+    lightbringerButtonAppearInExpandedCallLogItemCount = 0;
+    lightbringerButtonAppearInSearchCount = 0;
+  }
 }
diff --git a/java/com/android/voicemail/impl/VoicemailClientReceiver.java b/java/com/android/voicemail/impl/VoicemailClientReceiver.java
index 49a55a41b..688636e6c 100644
--- a/java/com/android/voicemail/impl/VoicemailClientReceiver.java
+++ b/java/com/android/voicemail/impl/VoicemailClientReceiver.java
@@ -23,6 +23,7 @@ import android.telecom.PhoneAccountHandle;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.voicemail.VoicemailClient;
+import com.android.voicemail.VoicemailComponent;
 import com.android.voicemail.impl.sync.UploadTask;
 import com.android.voicemail.impl.sync.VvmAccountManager;
 
@@ -31,6 +32,11 @@ public class VoicemailClientReceiver extends BroadcastReceiver {
 
   @Override
   public void onReceive(Context context, Intent intent) {
+    if (!VoicemailComponent.get(context).getVoicemailClient().isVoicemailModuleEnabled()) {
+      LogUtil.i(
+          "VoicemailClientReceiver.onReceive", "module disabled, ignoring " + intent.getAction());
+      return;
+    }
     switch (intent.getAction()) {
       case VoicemailClient.ACTION_UPLOAD:
         doUpload(context);