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

Commit ef0d4a69 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by Android (Google) Code Review
Browse files

Merge "Listening to package broadcast on all users" into sc-v2-dev

parents 2a54e74e da731460

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -4534,13 +4534,15 @@ public class AlarmManagerService extends SystemService { 
            filter.addAction(Intent.ACTION_PACKAGE_RESTARTED);

            filter.addAction(Intent.ACTION_QUERY_PACKAGE_RESTART);

            filter.addDataScheme(IntentFilter.SCHEME_PACKAGE);

            getContext().registerReceiver(this, filter);

            getContext().registerReceiverForAllUsers(this, filter,

                    /* broadcastPermission */ null, /* scheduler */ null);

            // Register for events related to sdcard installation.

            IntentFilter sdFilter = new IntentFilter();

            sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE);

            sdFilter.addAction(Intent.ACTION_USER_STOPPED);

            sdFilter.addAction(Intent.ACTION_UID_REMOVED);

            getContext().registerReceiver(this, sdFilter);

            getContext().registerReceiverForAllUsers(this, sdFilter,

                    /* broadcastPermission */ null, /* scheduler */ null);

        }



        @Override

services/tests/mockingservicestests/src/com/android/server/alarm/AlarmManagerServiceTest.java

+2 −2
Original line number Diff line number Diff line
@@ -462,9 +462,9 @@ public class AlarmManagerServiceTest { 


        final ArgumentCaptor<AlarmManagerService.UninstallReceiver> packageReceiverCaptor =

                ArgumentCaptor.forClass(AlarmManagerService.UninstallReceiver.class);

        verify(mMockContext).registerReceiver(packageReceiverCaptor.capture(),

        verify(mMockContext).registerReceiverForAllUsers(packageReceiverCaptor.capture(),

                argThat((filter) -> filter.hasAction(Intent.ACTION_PACKAGE_ADDED)

                        && filter.hasAction(Intent.ACTION_PACKAGE_REMOVED)));

                        && filter.hasAction(Intent.ACTION_PACKAGE_REMOVED)), isNull(), isNull());

        mPackageChangesReceiver = packageReceiverCaptor.getValue();



        assertEquals(mService.mExactAlarmCandidates, Collections.emptySet());