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

1 files changed, 36 insertions, 8 deletions

diff --git a/java/com/android/dialer/app/settings/DialerSettingsActivity.java b/java/com/android/dialer/app/settings/DialerSettingsActivity.java
index bbf1cfae5..ff3841aa1 100644
--- a/java/com/android/dialer/app/settings/DialerSettingsActivity.java
+++ b/java/com/android/dialer/app/settings/DialerSettingsActivity.java
@@ -24,6 +24,8 @@ import android.os.Bundle;
 import android.os.UserManager;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.TelephonyManager;
 import android.view.MenuItem;
@@ -31,8 +33,10 @@ import android.widget.Toast;
 import com.android.contacts.common.compat.TelephonyManagerCompat;
 import com.android.dialer.app.R;
 import com.android.dialer.blocking.FilteredNumberCompat;
+import com.android.dialer.common.LogUtil;
 import com.android.dialer.compat.CompatUtils;
 import com.android.dialer.proguard.UsedByReflection;
+import com.android.voicemail.VoicemailClient;
 import com.android.voicemail.VoicemailComponent;
 import java.util.List;
 
@@ -119,14 +123,7 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity {
       migrationStatusOnBuildHeaders = FilteredNumberCompat.hasMigratedToNewBlocking(this);
     }
 
-    String voicemailSettingsFragment =
-        VoicemailComponent.get(this).getVoicemailClient().getSettingsFragment();
-    if (isPrimaryUser && voicemailSettingsFragment != null) {
-      Header voicemailSettings = new Header();
-      voicemailSettings.titleRes = R.string.voicemail_settings_label;
-      voicemailSettings.fragment = voicemailSettingsFragment;
-      target.add(voicemailSettings);
-    }
+    addVoicemailSettings(target, isPrimaryUser);
 
     if (isPrimaryUser
         && (TelephonyManagerCompat.isTtyModeSupported(telephonyManager)
@@ -140,6 +137,37 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity {
     }
   }
 
+  private void addVoicemailSettings(List<Header> target, boolean isPrimaryUser) {
+    if (!isPrimaryUser) {
+      LogUtil.i("DialerSettingsActivity.addVoicemailSettings", "user not primary user");
+      return;
+    }
+    String voicemailSettingsFragment =
+        VoicemailComponent.get(this).getVoicemailClient().getSettingsFragment();
+    if (voicemailSettingsFragment == null) {
+      LogUtil.i(
+          "DialerSettingsActivity.addVoicemailSettings",
+          "VoicemailClient does not provide settings");
+      return;
+    }
+
+    PhoneAccountHandle phoneAccountHandle =
+        getSystemService(TelecomManager.class)
+            .getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
+    if (phoneAccountHandle == null) {
+      LogUtil.e("DialerSettingsActivity.addVoicemailSettings", "phoneAccountHandle is null");
+      return;
+    }
+    LogUtil.i("DialerSettingsActivity.addVoicemailSettings", "adding voicemail settings");
+    Header voicemailSettings = new Header();
+    voicemailSettings.titleRes = R.string.voicemail_settings_label;
+    voicemailSettings.fragment = voicemailSettingsFragment;
+    Bundle bundle = new Bundle();
+    bundle.putParcelable(VoicemailClient.PARAM_PHONE_ACCOUNT_HANDLE, phoneAccountHandle);
+    voicemailSettings.fragmentArguments = bundle;
+    target.add(voicemailSettings);
+  }
+
   /**
    * Returns {@code true} or {@code false} based on whether the display options setting should be
    * shown. For languages such as Chinese, Japanese, or Korean, display options aren't useful since