commit e7fa5658917b9623c9bcd535b3fc236dae960764
author Ta-wei Yen <twyen@google.com> Thu Apr 27 19:44:39 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 27 19:44:39 2017 +0000
tree 4484892be1c271b5e8c301be116428ab824a6aef
parent 797017f90b967c41affd99490b39f0b3124ec023
parent fbe460d7fb012a03dea077d6773404c5e28cd60f

Merge "Fix NPE in getDisabledCapabilities()"

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 0b321b5..c82012a 100644
--- a/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java
+++ b/src/com/android/phone/vvm/omtp/OmtpVvmCarrierConfigHelper.java
@@ -35,6 +35,7 @@
 import com.android.phone.vvm.omtp.sms.StatusMessage;
 import com.android.phone.vvm.omtp.utils.PhoneAccountHandleConverter;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Set;
 
 /**
@@ -280,10 +281,14 @@
         if (!bundle.containsKey(KEY_VVM_DISABLED_CAPABILITIES_STRING_ARRAY)) {
             return null;
         }
-        ArraySet<String> result = new ArraySet<String>();
-        result.addAll(
-                Arrays.asList(bundle.getStringArray(KEY_VVM_DISABLED_CAPABILITIES_STRING_ARRAY)));
-        return result;
+        String[] disabledCapabilities =
+                bundle.getStringArray(KEY_VVM_DISABLED_CAPABILITIES_STRING_ARRAY);
+        if (disabledCapabilities != null && disabledCapabilities.length > 0) {
+            ArraySet<String> result = new ArraySet<>();
+            Collections.addAll(result, disabledCapabilities);
+            return result;
+        }
+        return null;
     }
 
     public String getClientPrefix() {