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

Commit 68c9621c authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 10459084 from c228c194 to udc-qpr1-release 

Change-Id: I2535a23ce7d81b22ef34808348a0c208298dc028
parents 0bb8b68a c228c194

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

+2 −1
Original line number Diff line number Diff line
@@ -572,6 +572,7 @@ public class CallsManager extends Call.ListenerBase 
            CallAnomalyWatchdog callAnomalyWatchdog,

            Ringer.AccessibilityManagerAdapter accessibilityManagerAdapter,

            Executor asyncTaskExecutor,

            Executor asyncCallAudioTaskExecutor,

            BlockedNumbersAdapter blockedNumbersAdapter,

            TransactionManager transactionManager,

            EmergencyCallDiagnosticLogger emergencyCallDiagnosticLogger,
@@ -606,7 +607,7 @@ public class CallsManager extends Call.ListenerBase 
                        statusBarNotifier,

                        audioServiceFactory,

                        CallAudioRouteStateMachine.EARPIECE_AUTO_DETECT,

                        asyncTaskExecutor

                        asyncCallAudioTaskExecutor

                );

        callAudioRouteStateMachine.initialize();

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

+2 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ public class TelecomSystem { 
            DeviceIdleControllerAdapter deviceIdleControllerAdapter,

            Ringer.AccessibilityManagerAdapter accessibilityManagerAdapter,

            Executor asyncTaskExecutor,

            Executor asyncCallAudioTaskExecutor,

            BlockedNumbersAdapter blockedNumbersAdapter) {

        mContext = context.getApplicationContext();

        LogUtils.initLogging(mContext);
@@ -396,6 +397,7 @@ public class TelecomSystem { 
                    callAnomalyWatchdog,

                    accessibilityManagerAdapter,

                    asyncTaskExecutor,

                    asyncCallAudioTaskExecutor,

                    blockedNumbersAdapter,

                    transactionManager,

                    emergencyCallDiagnosticLogger,

src/com/android/server/telecom/components/TelecomService.java

+1 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ public class TelecomService extends Service implements TelecomSystem.Component { 
                                }

                            },

                            Executors.newCachedThreadPool(),

                            Executors.newSingleThreadExecutor(),

                            new BlockedNumbersAdapter() {

                                @Override

                                public boolean shouldShowEmergencyCallNotification(Context

tests/src/com/android/server/telecom/tests/CallsManagerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -345,6 +345,8 @@ public class CallsManagerTest extends TelecomTestCase { 
                mAccessibilityManagerAdapter,

                // Just do async tasks synchronously to support testing.

                command -> command.run(),

                // For call audio tasks

                command -> command.run(),

                mBlockedNumbersAdapter,

                TransactionManager.getTestInstance(),

                mEmergencyCallDiagnosticLogger,

tests/src/com/android/server/telecom/tests/TelecomSystemTest.java

+1 −0
Original line number Diff line number Diff line
@@ -549,6 +549,7 @@ public class TelecomSystemTest extends TelecomTestCase { 
                    }

                }, mDeviceIdleControllerAdapter, mAccessibilityManagerAdapter,

                Runnable::run,

                Runnable::run,

                mBlockedNumbersAdapter);



        mComponentContextFixture.setTelecomManager(new TelecomManager(