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

Commit e8a2c87a authored by Chinmay Dhodapkar's avatar Chinmay Dhodapkar Committed by Automerger Merge Worker
Browse files

Merge "Enable broadcast receiver for all users" into udc-dev am: 22547912 

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



Change-Id: I502ae9439b931e5360ce094722a73ac48f6c3aab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a6a3809 22547912

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

+2 −1
Original line number Diff line number Diff line
@@ -1739,7 +1739,8 @@ public class InCallController extends CallsManagerListenerBase implements 


        IntentFilter packageChangedFilter = new IntentFilter(Intent.ACTION_PACKAGE_CHANGED);

        packageChangedFilter.addDataScheme("package");

        mContext.registerReceiver(mPackageChangedReceiver, packageChangedFilter);

        mContext.registerReceiverAsUser(mPackageChangedReceiver, UserHandle.ALL,

                packageChangedFilter, null, null);

    }



    private void updateNonUiInCallServices(Call call) {

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

+2 −2
Original line number Diff line number Diff line
@@ -233,8 +233,8 @@ public class InCallControllerTests extends TelecomTestCase { 
        doAnswer(invocation -> {

            mRegisteredReceiver = invocation.getArgument(0);

            return null;

        }).when(mMockContext).registerReceiver(any(BroadcastReceiver.class),

                any(IntentFilter.class));

        }).when(mMockContext).registerReceiverAsUser(any(BroadcastReceiver.class),

                any(), any(IntentFilter.class), any(), any());



        ArgumentCaptor<SystemStateHelper.SystemStateListener> systemStateListenerArgumentCaptor

                = ArgumentCaptor.forClass(SystemStateHelper.SystemStateListener.class);