commit f826e7fc75c69a88a63340b9ec0e59bd2453bafd
author Tyler Gunn <tgunn@google.com> Tue Jan 24 09:47:43 2017 -0800
committer gitbuildkicker <android-build@google.com> Tue Jan 24 14:13:38 2017 -0800
tree e4f0f129969889a20f4a20877b948527ab7312c7
parent 527a9c05728cfcd4e1ae02689cface33101b0f54

Adding null check to RemoteVvmTaskManager.

Adding missing null check for KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY
carrier config access.

Test: Manual.
Bug: 34651942
Change-Id: I85930e5851972012acaa02aeec0c468258541898
(cherry picked from commit 2dbab89fac8252c5a1f3e62c8c5138fb425b9eb7)

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 9236bd2..49b0a1c 100644
--- a/src/com/android/phone/vvm/RemoteVvmTaskManager.java
+++ b/src/com/android/phone/vvm/RemoteVvmTaskManager.java
@@ -114,9 +114,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());