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

Commit aa30be61 authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Fix CTS tests for devices without telephony feature" into main am: d8e3d327 am: 7cd1bc62 

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/2919606



Change-Id: Iac42996a17fe795841d9d9563cd8f59b62fed7dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 39884db7 7cd1bc62

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

+5 −5
Original line number Diff line number Diff line
@@ -2549,9 +2549,11 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
            }

        }



        // Bail early if the caller isn't the sim connection mgr.

        if (!isCallerConnectionManager) {

            Log.d(this, "queryRemoteConnectionServices: none; not sim call mgr.");

        Log.i(this, "queryRemoteConnectionServices, simServices = %s", simServices);

        // Bail early if the caller isn't the sim connection mgr or no sim connection service

        // other than caller available.

        if (!isCallerConnectionManager || simServices.isEmpty()) {

            Log.d(this, "queryRemoteConnectionServices: not sim call mgr or no simservices.");

            noRemoteServices(callback);

            return;

        }
@@ -2559,8 +2561,6 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
        final List<ComponentName> simServiceComponentNames = new ArrayList<>();

        final List<IBinder> simServiceBinders = new ArrayList<>();



        Log.i(this, "queryRemoteConnectionServices, simServices = %s", simServices);



        for (ConnectionServiceWrapper simService : simServices) {

            final ConnectionServiceWrapper currentSimService = simService;