Revert: "Init of OverlayManagerService on a parallel thread"
This reverts commit 94ab1a66a51a9ee8588ac7af8025299c01bf5e6f.
Reason for revert: overlays are only available after the overlay manager is
initialized. By *not* threading the initialization, the system defines a strong
guarantee that any system service started after the overlay manager's
constructor has been executed can use RRO. This is analogous to how the package
manager scans for application packages as part of its constructor.
As an example of why we need to establish a point in the boot sequence where
overlays are guaranteed to be available, without this commit it is not possible
to customize the default values of the settings provider, that is, an overlay
defined as follows:
- AndroidManifest.xml:
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.providers.settings.overlay" >
<overlay
android:targetPackage="com.android.providers.settings"
android:isStatic="true"
android:priority="1" />
</manifest>
- res/values/values.xml:
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="def_notification_pulse">false</bool>
</resources>
will not be part of the APK paths obtained from the package manager when
forking what will become the SettingsProvider process. By making sure the
overlay manager is fully initialized before returning from its constructor, we
also make sure that the package manager has an up-to-date list of APK paths
ready for when Zygote will fork and specialize.
Bug: 80150169
Test: install an overlay as outlined above && \
adb exec-out stop && \
adb exec-out rm -rf /data/system/users && \
adb exec-out start && \
adb exec-out cmd settings get system notification_light_pulse # expected output is '0'
Change-Id: Ifc93ae95fba293a65ea1d834a64da8077f17def0
diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java
index f1b03d1..0147d7e 100644
--- a/services/core/java/com/android/server/om/OverlayManagerService.java
+++ b/services/core/java/com/android/server/om/OverlayManagerService.java
@@ -23,7 +23,6 @@
import static android.content.Intent.ACTION_USER_ADDED;
import static android.content.Intent.ACTION_USER_REMOVED;
import static android.content.pm.PackageManager.GET_SHARED_LIBRARY_FILES;
-import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;
import static android.content.pm.PackageManager.SIGNATURE_MATCH;
import android.annotation.NonNull;
@@ -59,11 +58,9 @@
import android.util.Slog;
import android.util.SparseArray;
-import com.android.internal.util.ConcurrentUtils;
import com.android.server.FgThread;
import com.android.server.IoThread;
import com.android.server.LocalServices;
-import com.android.server.SystemServerInitThreadPool;
import com.android.server.SystemService;
import com.android.server.pm.Installer;
import com.android.server.pm.UserManagerService;
@@ -84,8 +81,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicBoolean;
/**
@@ -228,8 +223,6 @@
private final AtomicBoolean mPersistSettingsScheduled = new AtomicBoolean(false);
- private Future<?> mInitCompleteSignal;
-
public OverlayManagerService(@NonNull final Context context,
@NonNull final Installer installer) {
super(context);
@@ -241,29 +234,28 @@
mSettings = new OverlayManagerSettings();
mImpl = new OverlayManagerServiceImpl(mPackageManager, im, mSettings,
getDefaultOverlayPackages(), new OverlayChangeListener());
- mInitCompleteSignal = SystemServerInitThreadPool.get().submit(() -> {
- final IntentFilter packageFilter = new IntentFilter();
- packageFilter.addAction(ACTION_PACKAGE_ADDED);
- packageFilter.addAction(ACTION_PACKAGE_CHANGED);
- packageFilter.addAction(ACTION_PACKAGE_REMOVED);
- packageFilter.addDataScheme("package");
- getContext().registerReceiverAsUser(new PackageReceiver(), UserHandle.ALL,
- packageFilter, null, null);
- final IntentFilter userFilter = new IntentFilter();
- userFilter.addAction(ACTION_USER_ADDED);
- userFilter.addAction(ACTION_USER_REMOVED);
- getContext().registerReceiverAsUser(new UserReceiver(), UserHandle.ALL,
- userFilter, null, null);
+ final IntentFilter packageFilter = new IntentFilter();
+ packageFilter.addAction(ACTION_PACKAGE_ADDED);
+ packageFilter.addAction(ACTION_PACKAGE_CHANGED);
+ packageFilter.addAction(ACTION_PACKAGE_REMOVED);
+ packageFilter.addDataScheme("package");
+ getContext().registerReceiverAsUser(new PackageReceiver(), UserHandle.ALL,
+ packageFilter, null, null);
- restoreSettings();
+ final IntentFilter userFilter = new IntentFilter();
+ userFilter.addAction(ACTION_USER_ADDED);
+ userFilter.addAction(ACTION_USER_REMOVED);
+ getContext().registerReceiverAsUser(new UserReceiver(), UserHandle.ALL,
+ userFilter, null, null);
- initIfNeeded();
- onSwitchUser(UserHandle.USER_SYSTEM);
+ restoreSettings();
- publishBinderService(Context.OVERLAY_SERVICE, mService);
- publishLocalService(OverlayManagerService.class, this);
- }, "Init OverlayManagerService");
+ initIfNeeded();
+ onSwitchUser(UserHandle.USER_SYSTEM);
+
+ publishBinderService(Context.OVERLAY_SERVICE, mService);
+ publishLocalService(OverlayManagerService.class, this);
}
@Override
@@ -271,22 +263,7 @@
// Intentionally left empty.
}
- @Override
- public void onBootPhase(int phase) {
- if (phase == PHASE_SYSTEM_SERVICES_READY && mInitCompleteSignal != null) {
- ConcurrentUtils.waitForFutureNoInterrupt(mInitCompleteSignal,
- "Wait for OverlayManagerService init");
- mInitCompleteSignal = null;
- }
- }
-
public void updateSystemUiContext() {
- if (mInitCompleteSignal != null) {
- ConcurrentUtils.waitForFutureNoInterrupt(mInitCompleteSignal,
- "Wait for OverlayManagerService init");
- mInitCompleteSignal = null;
- }
-
final ApplicationInfo ai;
try {
ai = mPackageManager.mPackageManager.getApplicationInfo("android",