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

Commit 0c66f15c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31836022']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31836022'] into sparse-13083703-L97000030009736637.
SPARSE_CHANGE: I6d7294b535041783b420b818ef1771b15ea75722

Change-Id: I782ff694b9298d1aae9dee41be85aaf788a8aa75
parents 5b1ee20e 127b3a77

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) {