Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec849a61 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix to add existing connection for emergency only account." am: 30cecdb8 am: 6f36c7fd 

Change-Id: I39b95a6b609fd61be4391fde742b526c7eabe032
parents 446ff4a7 6f36c7fd

src/com/android/server/telecom/ConnectionServiceWrapper.java

+4 −1
Original line number Diff line number Diff line
@@ -813,8 +813,11 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                    // ParcelableConnection is in fact registered to Telecom and is being called

                    // from the correct user.

                    List<PhoneAccountHandle> accountHandles =

                    // Include CAPABILITY_EMERGENCY_CALLS_ONLY in this list in case we are adding

                    // an emergency call.

                            mPhoneAccountRegistrar.getCallCapablePhoneAccounts(null /*uriScheme*/,

                                    false /*includeDisabledAccounts*/, userHandle);

                            false /*includeDisabledAccounts*/, userHandle, 0 /*capabilities*/,

                            0 /*excludedCapabilities*/);

                    PhoneAccountHandle phoneAccountHandle = null;

                    for (PhoneAccountHandle accountHandle : accountHandles) {

                        if(accountHandle.equals(callingPhoneAccountHandle)) {