Merge "Listening to package broadcast on all users" into sc-v2-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
ef0d4a69ed
@@ -4534,13 +4534,15 @@ public class AlarmManagerService extends SystemService {
|
|||||||
filter.addAction(Intent.ACTION_PACKAGE_RESTARTED);
|
filter.addAction(Intent.ACTION_PACKAGE_RESTARTED);
|
||||||
filter.addAction(Intent.ACTION_QUERY_PACKAGE_RESTART);
|
filter.addAction(Intent.ACTION_QUERY_PACKAGE_RESTART);
|
||||||
filter.addDataScheme(IntentFilter.SCHEME_PACKAGE);
|
filter.addDataScheme(IntentFilter.SCHEME_PACKAGE);
|
||||||
getContext().registerReceiver(this, filter);
|
getContext().registerReceiverForAllUsers(this, filter,
|
||||||
|
/* broadcastPermission */ null, /* scheduler */ null);
|
||||||
// Register for events related to sdcard installation.
|
// Register for events related to sdcard installation.
|
||||||
IntentFilter sdFilter = new IntentFilter();
|
IntentFilter sdFilter = new IntentFilter();
|
||||||
sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE);
|
sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE);
|
||||||
sdFilter.addAction(Intent.ACTION_USER_STOPPED);
|
sdFilter.addAction(Intent.ACTION_USER_STOPPED);
|
||||||
sdFilter.addAction(Intent.ACTION_UID_REMOVED);
|
sdFilter.addAction(Intent.ACTION_UID_REMOVED);
|
||||||
getContext().registerReceiver(this, sdFilter);
|
getContext().registerReceiverForAllUsers(this, sdFilter,
|
||||||
|
/* broadcastPermission */ null, /* scheduler */ null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -462,9 +462,9 @@ public class AlarmManagerServiceTest {
|
|||||||
|
|
||||||
final ArgumentCaptor<AlarmManagerService.UninstallReceiver> packageReceiverCaptor =
|
final ArgumentCaptor<AlarmManagerService.UninstallReceiver> packageReceiverCaptor =
|
||||||
ArgumentCaptor.forClass(AlarmManagerService.UninstallReceiver.class);
|
ArgumentCaptor.forClass(AlarmManagerService.UninstallReceiver.class);
|
||||||
verify(mMockContext).registerReceiver(packageReceiverCaptor.capture(),
|
verify(mMockContext).registerReceiverForAllUsers(packageReceiverCaptor.capture(),
|
||||||
argThat((filter) -> filter.hasAction(Intent.ACTION_PACKAGE_ADDED)
|
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();
|
mPackageChangesReceiver = packageReceiverCaptor.getValue();
|
||||||
|
|
||||||
assertEquals(mService.mExactAlarmCandidates, Collections.emptySet());
|
assertEquals(mService.mExactAlarmCandidates, Collections.emptySet());
|
||||||
|
|||||||
Reference in New Issue
Block a user