commit db5e2534db9b486e7b66add873b69c17d2e26bf6
author Treehugger Robot <treehugger-gerrit@google.com> Sat Apr 29 02:26:05 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Apr 29 02:26:06 2017 +0000
tree 283c64d75370d6fd105adfcc611ff2ded00abe66
parent 777d4a22dcf1e972f91087a37f8f14ae5639cb93
parent 5323042e0cf71dc0794bb0d340b90b2af0339ca7

Merge "Adding null check to RemoteVvmTaskManager."

src/com/android/phone/vvm/RemoteVvmTaskManager.java

diff --git a/src/com/android/phone/vvm/RemoteVvmTaskManager.java b/src/com/android/phone/vvm/RemoteVvmTaskManager.java
index b0f9fef..f48fc7e 100644
--- a/src/com/android/phone/vvm/RemoteVvmTaskManager.java
+++ b/src/com/android/phone/vvm/RemoteVvmTaskManager.java
@@ -115,9 +115,12 @@
                 .getSystemService(CarrierConfigManager.class).getConfigForSubId(subId);
         packages.add(
                 carrierConfig.getString(CarrierConfigManager.KEY_CARRIER_VVM_PACKAGE_NAME_STRING));
-        for (String packageName : carrierConfig
-                .getStringArray(CarrierConfigManager.KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY)) {
-            packages.add(packageName);
+        String[] vvmPackages = carrierConfig
+                .getStringArray(CarrierConfigManager.KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY);
+        if (vvmPackages != null && vvmPackages.length > 0) {
+            for (String packageName : vvmPackages) {
+                packages.add(packageName);
+            }
         }
         packages.add(context.getResources().getString(R.string.system_visual_voicemail_client));
         packages.add(telecomManager.getSystemDialerPackage());