commit be622845acb8492b19fad5036e64f6247ab7a89a
author Anthony Lee <anthonylee@google.com> Wed Aug 26 13:57:07 2015 -0700
committer Anthony Lee <anthonylee@google.com> Wed Aug 26 14:35:12 2015 -0700
tree 2f4a1261df0c850a71059da0bf7602c9db6359ce
parent fd3424403b2b1dedb81df8c55ecfcb73f2558871

NPE fix

Bug: 23519922
Change-Id: I0178861da84d0ef8da78242a9c43ddbf386b9043

src/com/android/services/telephony/ConferenceParticipantConnection.java

diff --git a/src/com/android/services/telephony/ConferenceParticipantConnection.java b/src/com/android/services/telephony/ConferenceParticipantConnection.java
index a2e3359..5406ab5 100644
--- a/src/com/android/services/telephony/ConferenceParticipantConnection.java
+++ b/src/com/android/services/telephony/ConferenceParticipantConnection.java
@@ -23,6 +23,7 @@
 import android.telecom.ConferenceParticipant;
 import android.telecom.DisconnectCause;
 import android.telecom.PhoneAccount;
+import android.text.TextUtils;
 
 /**
  * Represents a participant in a conference call.
@@ -150,9 +151,12 @@
      */
     private Uri getParticipantAddress(ConferenceParticipant participant) {
         Uri address = participant.getHandle();
+        if (address == null) {
+            return address;
+        }
 
         // If the participant's address is already a TEL scheme, just return it as is.
-        if (address.getScheme().equals(PhoneAccount.SCHEME_TEL)) {
+        if (PhoneAccount.SCHEME_TEL.equals(address.getScheme())) {
             return address;
         }
 
@@ -169,8 +173,11 @@
         // We can get the user field in these instances by splitting the string on the @, ;, or :
         // and looking at the first found item.
         String number = address.getSchemeSpecificPart();
-        String numberParts[] = number.split("[@;:]");
+        if (TextUtils.isEmpty(number)) {
+            return address;
+        }
 
+        String numberParts[] = number.split("[@;:]");
         if (numberParts.length == 0) {
             return address;
         }