1 files changed, 8 insertions, 2 deletions
diff --git a/java/com/android/dialer/databasepopulator/VoicemailPopulator.java b/java/com/android/dialer/databasepopulator/VoicemailPopulator.java
index e99f7c7d4..9e0f45345 100644
--- a/java/com/android/dialer/databasepopulator/VoicemailPopulator.java
+++ b/java/com/android/dialer/databasepopulator/VoicemailPopulator.java
@@ -19,9 +19,12 @@ package com.android.dialer.databasepopulator;
 import android.content.ComponentName;
 import android.content.ContentValues;
 import android.content.Context;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.provider.VoicemailContract.Status;
 import android.provider.VoicemailContract.Voicemails;
 import android.support.annotation.NonNull;
+import android.support.annotation.VisibleForTesting;
 import android.support.annotation.WorkerThread;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
@@ -98,13 +101,16 @@ public final class VoicemailPopulator {
         .delete(Voicemails.buildSourceUri(context.getPackageName()), "", new String[] {});
   }
 
-  private static void enableVoicemail(@NonNull Context context) {
+  @VisibleForTesting
+  public static void enableVoicemail(@NonNull Context context) {
     PhoneAccountHandle handle =
         new PhoneAccountHandle(new ComponentName(context, VoicemailPopulator.class), ACCOUNT_ID);
 
     ContentValues values = new ContentValues();
     values.put(Status.SOURCE_PACKAGE, handle.getComponentName().getPackageName());
-    values.put(Status.SOURCE_TYPE, TelephonyManager.VVM_TYPE_OMTP);
+    if (VERSION.SDK_INT >= VERSION_CODES.N_MR1) {
+      values.put(Status.SOURCE_TYPE, TelephonyManager.VVM_TYPE_OMTP);
+    }
     values.put(Status.PHONE_ACCOUNT_COMPONENT_NAME, handle.getComponentName().flattenToString());
     values.put(Status.PHONE_ACCOUNT_ID, handle.getId());
     values.put(Status.CONFIGURATION_STATE, Status.CONFIGURATION_STATE_OK);