summaryrefslogtreecommitdiff
path: root/apex
diff options
context:
space:
mode:
authorMatt Lee <matthewhlee@google.com>2022-06-12 23:19:47 +0000
committerMatt Lee <matthewhlee@google.com>2022-06-12 23:19:47 +0000
commit2ee3b28251c8f6864a6dbcd229b7a1641a4782e4 (patch)
tree3577b78cd7727ed3695b831753db86a62462ed7b /apex
parent64c414abd49acc8d488837ab90b51d822c23e66d (diff)
Revert "Merge s-mpr-2022-06"
Revert submission 732792 Reason for revert: build failure Reverted Changes: I3cbe7c924:Merge s-mpr-2022-06 I9881453ba:Don't set background color if TDA doesn't have a v... I57fa88c6f:Use TDA for background color instead of new color ... Ic2fa89b76:Dialing phone state should update active sub Change-Id: I9709841558bfcb325f7e205f5f5ec89c620d14dd
Diffstat (limited to 'apex')
-rw-r--r--apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
index c9b33aa4dafc..95728081bdb9 100644
--- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
+++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
@@ -4534,15 +4534,13 @@ public class AlarmManagerService extends SystemService {
filter.addAction(Intent.ACTION_PACKAGE_RESTARTED);
filter.addAction(Intent.ACTION_QUERY_PACKAGE_RESTART);
filter.addDataScheme(IntentFilter.SCHEME_PACKAGE);
- getContext().registerReceiverForAllUsers(this, filter,
- /* broadcastPermission */ null, /* scheduler */ null);
+ getContext().registerReceiver(this, filter);
// 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().registerReceiverForAllUsers(this, sdFilter,
- /* broadcastPermission */ null, /* scheduler */ null);
+ getContext().registerReceiver(this, sdFilter);
}
@Override