commit 2b418f050844e5c58e7710248a312d78e4fbee7e
author Ta-wei Yen <twyen@google.com> Wed May 03 21:04:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 03 21:04:26 2017 +0000
tree eec4d04e6bd65f026c68326a201d362263b3fd63
parent 61c69a8119b1130db31452a0f6da218e133c7feb
parent e885675d2560660143c73ac628a9e3b3803c2014

Merge "Fix another access of string array that may potentially be null." am: b4050f4ff1
am: e885675d25

Change-Id: I8b0c2108722d0364f94eb5f8a2beb4af573579d4

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;