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

Commit 6d125d62 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5663715 from 5a66302f to qt-c2f2-release

Change-Id: I20c6732dd78393b516a1f894633af1bbbd9e7ac9
parents 3228ee0d 5a66302f
Loading
Loading
Loading
Loading
+12 −3
Original line number Diff line number Diff line
@@ -823,9 +823,18 @@ public class ConnectionServiceWrapper extends ServiceBinder implements
                    }
                    // Allow the Sim call manager account as well, even if its disabled.
                    if (phoneAccountHandle == null && callingPhoneAccountHandle != null) {
                        if (callingPhoneAccountHandle.equals(
                                mPhoneAccountRegistrar.getSimCallManager(userHandle))) {
                            phoneAccountHandle = callingPhoneAccountHandle;
                        // Search all SIM PhoneAccounts to see if there is a SIM call manager
                        // associated with any of them and verify that the calling handle matches.
                        for (PhoneAccountHandle handle :
                                mPhoneAccountRegistrar.getSimPhoneAccounts(userHandle)) {
                            int subId = mPhoneAccountRegistrar.getSubscriptionIdForPhoneAccount(
                                    handle);
                            PhoneAccountHandle connectionMgrHandle =
                                    mPhoneAccountRegistrar.getSimCallManager(subId, userHandle);
                            if (callingPhoneAccountHandle.equals(connectionMgrHandle)) {
                                phoneAccountHandle = connectionMgrHandle;
                                break;
                            }
                        }
                    }
                    if (phoneAccountHandle != null) {