commit e9fb7cf1daa0bfd386a1a0f75c0364085b0ec81e
author Jordan Liu <jminjie@google.com> Wed Jul 10 19:00:05 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 10 19:00:05 2019 +0000
tree 2344e4461740696653d551f65a70be5f9dc55e65
parent 0ebde2e4e3fbc03096eab335623ff83fed361349
parent 575c0d0b82014c205d90d527212c173f5b0a6e93

Merge "Use setChannelId instead of setChannel"

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 1f330f9..6d2e982 100644
--- a/src/com/android/services/telephony/ConferenceParticipantConnection.java
+++ b/src/com/android/services/telephony/ConferenceParticipantConnection.java
@@ -231,7 +231,7 @@
         SubscriptionInfo subInfo = TelecomAccountRegistry.getInstance(null).
                 getSubscriptionManager().getActiveSubscriptionInfo(subId);
 
-        if (subInfo == null) {
+        if (subInfo == null || TextUtils.isEmpty(subInfo.getCountryIso())) {
             return null;
         }
         // The SubscriptionInfo reports ISO country codes in lower case.  Convert to upper case,