summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-07 14:42:27 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-10-07 14:42:27 +0000
commit7f6fcb8be9981774e650f4bcf270f5b58470db1e (patch)
tree753f4cddca0bfafee7fcbd2235b2dc82a623f6c8
parentdc4004fd6d37de5f63199a6019665819487df910 (diff)
parentf058942060b1efdc4bed8037309f6cbfab7ffde8 (diff)
Merge "Update PreBootBroadcaster to use ProcessRecord."
-rw-r--r--services/core/java/com/android/server/am/PreBootBroadcaster.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/PreBootBroadcaster.java b/services/core/java/com/android/server/am/PreBootBroadcaster.java
index 35f91ba1169b..9b7c3acb71d8 100644
--- a/services/core/java/com/android/server/am/PreBootBroadcaster.java
+++ b/services/core/java/com/android/server/am/PreBootBroadcaster.java
@@ -57,6 +57,7 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub {
private static final String TAG = "PreBootBroadcaster";
private final ActivityManagerService mService;
+ private final ProcessRecord mSystemApp;
private final int mUserId;
private final ProgressReporter mProgress;
private final boolean mQuiet;
@@ -69,6 +70,9 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub {
public PreBootBroadcaster(ActivityManagerService service, int userId,
ProgressReporter progress, boolean quiet) {
mService = service;
+ synchronized (mService) {
+ mSystemApp = mService.getProcessRecordLocked("system", android.os.Process.SYSTEM_UID);
+ }
mUserId = userId;
mProgress = progress;
mQuiet = quiet;
@@ -123,8 +127,8 @@ public abstract class PreBootBroadcaster extends IIntentReceiver.Stub {
TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED,
REASON_PRE_BOOT_COMPLETED, "");
synchronized (mService) {
- mService.broadcastIntentLocked(null, null, null, mIntent, null, this, 0, null, null,
- null, null, null, AppOpsManager.OP_NONE, bOptions.toBundle(), true,
+ mService.broadcastIntentLocked(mSystemApp, "android", null, mIntent, null, this, 0,
+ null, null, null, null, null, AppOpsManager.OP_NONE, bOptions.toBundle(), true,
false, ActivityManagerService.MY_PID,
Process.SYSTEM_UID, Binder.getCallingUid(), Binder.getCallingPid(), mUserId);
}