commit b4050f4ff15b951f290c3e3e4f31396b3612818f
author Ta-wei Yen <twyen@google.com> Wed May 03 20:57:23 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 03 20:57:24 2017 +0000
tree b0078823bb1e61f317ca8661e090023dd3b26211
parent 5b72ca6b8efd92425dd9f0bc12a00e94b687fac4
parent 865b9fca89a996f616437a9eac6d9e30adf59abb

Merge "Fix another access of string array that may potentially be null."

src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java

diff --git a/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java b/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java
index c82012a..486b07c 100644
--- a/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java
+++ b/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java
@@ -192,8 +192,11 @@
             names.add(bundle.getString(KEY_CARRIER_VVM_PACKAGE_NAME_STRING));
         }
         if (bundle.containsKey(KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY)) {
-            names.addAll(Arrays.asList(
-                    bundle.getStringArray(KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY)));
+            String[] vvmPackages = bundle.getStringArray(KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY);
+            if (vvmPackages != null && vvmPackages.length > 0) {
+                names.addAll(Arrays.asList(
+                        bundle.getStringArray(KEY_CARRIER_VVM_PACKAGE_NAME_STRING_ARRAY)));
+            }
         }
         if (names.isEmpty()) {
             return null;