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

Commit 5fff8695 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31836022'] into 25Q1-release. 

Change-Id: I5c896b485c78673bfc5e706601417f2c576f3384
parents 6ce4bf0e ebb7056d

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

+0 −6
Original line number Diff line number Diff line
@@ -1670,9 +1670,6 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                    }

                } else {

                    Log.w(this, "createConference: Scheduled executor is null or shutdown");

                    mAnomalyReporter.reportAnomaly(

                        NULL_SCHEDULED_EXECUTOR_ERROR_UUID,

                        NULL_SCHEDULED_EXECUTOR_ERROR_MSG);

                }

                try {

                    mServiceInterface.createConference(
@@ -1812,9 +1809,6 @@ public class ConnectionServiceWrapper extends ServiceBinder implements 
                    }

                } else {

                    Log.w(this, "createConnection: Scheduled executor is null or shutdown");

                    mAnomalyReporter.reportAnomaly(

                        NULL_SCHEDULED_EXECUTOR_ERROR_UUID,

                        NULL_SCHEDULED_EXECUTOR_ERROR_MSG);

                }

                try {

                    if (mFlags.cswServiceInterfaceIsNull() && mServiceInterface == null) {