diff options
| author | Andrei-Valentin Onea <andreionea@google.com> | 2021-01-07 14:04:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-01-07 14:04:12 +0000 |
| commit | 29ed176b46bd5d754e582c2c506193f1993a33fa (patch) | |
| tree | 2b46673a945fc691bc1c9fa249ff490332967948 /services/java/com/android/server/SystemServer.java | |
| parent | 169c132627440174123c5fafed6c6e5fb97c584e (diff) | |
| parent | 46111c8ea0b39e6f0ace60681169cc83c4bc93e2 (diff) | |
Merge changes from topic "preinstall-overrides"
* changes:
Add force_non_debuggable_final_build_for_compat
Allow overriding compat config prior to install time.
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index d55a5b7792d4..d533848c6f75 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -912,6 +912,9 @@ public final class SystemServer { mActivityManagerService.setSystemProcess(); t.traceEnd(); + // The package receiver depends on the activity service in order to get registered. + platformCompat.registerPackageReceiver(mSystemContext); + // Complete the watchdog setup with an ActivityManager instance and listen for reboots // Do this only after the ActivityManagerService is properly started as a system process t.traceBegin("InitWatchdog"); |