From d8046e520a866b9948ee9ba47cf642b441ca8e23 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Thu, 6 Apr 2017 09:41:50 -0700
Subject: Update AOSP Dialer source from internal google3 repository at
 cl/152373142.

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217
---
 .../voicemail/impl/VoicemailClientImpl.java        | 34 +++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'java/com/android/voicemail/impl/VoicemailClientImpl.java')

diff --git a/java/com/android/voicemail/impl/VoicemailClientImpl.java b/java/com/android/voicemail/impl/VoicemailClientImpl.java
index b1c301a0a..31a12791c 100644
--- a/java/com/android/voicemail/impl/VoicemailClientImpl.java
+++ b/java/com/android/voicemail/impl/VoicemailClientImpl.java
@@ -15,6 +15,7 @@ package com.android.voicemail.impl;
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Build.VERSION_CODES;
 import android.provider.VoicemailContract.Status;
 import android.provider.VoicemailContract.Voicemails;
@@ -23,9 +24,12 @@ import android.support.v4.os.BuildCompat;
 import android.telecom.PhoneAccountHandle;
 import android.telephony.TelephonyManager;
 import com.android.dialer.common.Assert;
+import com.android.dialer.common.ConfigProviderBindings;
+import com.android.dialer.common.LogUtil;
 import com.android.voicemail.VisualVoicemailTypeExtensions;
 import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.impl.settings.VisualVoicemailSettingsUtil;
+import com.android.voicemail.impl.settings.VoicemailChangePinActivity;
 import com.android.voicemail.impl.settings.VoicemailSettingsFragment;
 import java.util.List;
 import javax.inject.Inject;
@@ -44,6 +48,9 @@ public class VoicemailClientImpl implements VoicemailClient {
    */
   private static final String[] OMTP_VOICEMAIL_BLACKLIST = {"com.android.phone"};
 
+  // Flag name used for configuration
+  private static final String ALLOW_VOICEMAIL_ARCHIVE = "allow_voicemail_archive";
+
   private static final String[] OMTP_VOICEMAIL_TYPE = {
     TelephonyManager.VVM_TYPE_OMTP,
     TelephonyManager.VVM_TYPE_CVVM,
@@ -71,12 +78,37 @@ public class VoicemailClientImpl implements VoicemailClient {
     return VisualVoicemailSettingsUtil.isArchiveEnabled(context, phoneAccountHandle);
   }
 
+  @Override
+  public boolean isVoicemailArchiveAvailable(Context context) {
+    if (!BuildCompat.isAtLeastO()) {
+      LogUtil.i("VoicemailClientImpl.isVoicemailArchiveAllowed", "not running on O or later");
+      return false;
+    }
+
+    if (!ConfigProviderBindings.get(context).getBoolean(ALLOW_VOICEMAIL_ARCHIVE, true)) {
+      LogUtil.i(
+          "VoicemailClientImpl.isVoicemailArchiveAllowed",
+          "feature disabled by config: %s",
+          ALLOW_VOICEMAIL_ARCHIVE);
+      return false;
+    }
+
+    return true;
+  }
+
   @Override
   public void setVoicemailArchiveEnabled(
       Context context, PhoneAccountHandle phoneAccountHandle, boolean value) {
     VisualVoicemailSettingsUtil.setArchiveEnabled(context, phoneAccountHandle, value);
   }
 
+  @Override
+  public Intent getSetPinIntent(Context context, PhoneAccountHandle phoneAccountHandle) {
+    Intent intent = new Intent(context, VoicemailChangePinActivity.class);
+    intent.putExtra(VoicemailChangePinActivity.EXTRA_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
+    return intent;
+  }
+
   @TargetApi(VERSION_CODES.O)
   @Override
   public void appendOmtpVoicemailSelectionClause(
@@ -134,7 +166,7 @@ public class VoicemailClientImpl implements VoicemailClient {
           }
           where.append(" (");
           {
-            where.append(Status.SOURCE_TYPE).append(" == ?");
+            where.append(Status.SOURCE_TYPE).append(" IS ?");
             selectionArgs.add(OMTP_VOICEMAIL_TYPE[i]);
             where.append(")");
           }
-- 
cgit v1.2.3