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

Commit b656eb5f authored by Santos Cordon's avatar Santos Cordon Committed by Android Git Automerger
Browse files

am 5adc858b: Merge "Dont clear serviceConnections on subsequent bind() calls." into lmp-dev 

* commit '5adc858b':
  Dont clear serviceConnections on subsequent bind() calls.
parents 75423efe 5adc858b

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

+4 −3
Original line number Diff line number Diff line
@@ -261,8 +261,6 @@ public final class InCallController extends CallsManagerListenerBase { 
    private void bind() {

        ThreadUtil.checkOnMainThread();

        if (mInCallServices.isEmpty()) {

            mServiceConnections.clear();



            PackageManager packageManager = mContext.getPackageManager();

            Intent serviceIntent = new Intent(InCallService.SERVICE_INTERFACE);
@@ -289,11 +287,14 @@ public final class InCallController extends CallsManagerListenerBase { 
                        continue;

                    }



                    Log.i(this, "Attempting to bind to InCall " + serviceInfo.packageName);

                    InCallServiceConnection inCallServiceConnection = new InCallServiceConnection();

                    ComponentName componentName = new ComponentName(serviceInfo.packageName,

                            serviceInfo.name);



                    Log.i(this, "Attempting to bind to InCall %s, is dupe? %b ",

                            serviceInfo.packageName,

                            mServiceConnections.containsKey(componentName));



                    if (!mServiceConnections.containsKey(componentName)) {

                        Intent intent = new Intent(InCallService.SERVICE_INTERFACE);

                        intent.setComponent(componentName);