Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8c651c9 authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

Revert "OMS: block until settings are persisted" 

Revert submission 1507500-oms-transactional-api

Reason for revert: b/177065099
Reverted Changes:
Ie5344c53d:OMS: add tests for the OMS transactional API
I8f54e1532:Push OverlayDeviceTests onto /system
I63df58510:OMS: add transactional API
Idacc0c67e:OverlayDeviceTests: add missing TEST_MAPPING
I2452f789a:OMS: block until settings are persisted
If58d5e9dd:OMS: replace OMSImpl.OverlayChangeListener with re...

Change-Id: Ia7b472238e1a6e6867054fbc053bd5c7a34ff23a
parent f2bf58fb

services/core/java/com/android/server/om/OverlayManagerService.java

+26 −20
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ import android.content.res.ApkAssets; 
import android.net.Uri;

import android.os.Binder;

import android.os.Environment;

import android.os.HandlerThread;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.ResultReceiver;
@@ -67,6 +66,7 @@ import android.util.SparseArray; 


import com.android.internal.content.om.OverlayConfig;

import com.android.server.FgThread;

import com.android.server.IoThread;

import com.android.server.LocalServices;

import com.android.server.SystemConfig;

import com.android.server.SystemService;
@@ -89,6 +89,7 @@ import java.util.HashMap; 
import java.util.HashSet;

import java.util.List;

import java.util.Map;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.function.Consumer;



/**
@@ -238,6 +239,8 @@ public final class OverlayManagerService extends SystemService { 


    private final OverlayActorEnforcer mActorEnforcer;



    private final AtomicBoolean mPersistSettingsScheduled = new AtomicBoolean(false);



    private final Consumer<PackageAndUser> mOnOverlaysChanged = (pair) -> {

        onOverlaysChanged(pair.packageName, pair.userId);

    };
@@ -256,16 +259,13 @@ public final class OverlayManagerService extends SystemService { 
                    OverlayConfig.getSystemInstance(), getDefaultOverlayPackages());

            mActorEnforcer = new OverlayActorEnforcer(mPackageManager);



            HandlerThread packageReceiverThread = new HandlerThread(TAG);

            packageReceiverThread.start();



            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, packageReceiverThread.getThreadHandler());

                    packageFilter, null, null);



            final IntentFilter userFilter = new IntentFilter();

            userFilter.addAction(ACTION_USER_ADDED);
@@ -318,7 +318,7 @@ public final class OverlayManagerService extends SystemService { 
                final List<String> targets = mImpl.updateOverlaysForUser(newUserId);

                updateAssets(newUserId, targets);

            }

            persistSettings();

            schedulePersistSettings();

        } finally {

            traceEnd(TRACE_TAG_RRO);

        }
@@ -973,7 +973,7 @@ public final class OverlayManagerService extends SystemService { 
    };



    private void onOverlaysChanged(@NonNull final String targetPackageName, final int userId) {

        persistSettings();

        schedulePersistSettings();

        FgThread.getHandler().post(() -> {

            updateAssets(userId, targetPackageName);
@@ -1065,7 +1065,12 @@ public final class OverlayManagerService extends SystemService { 
        }

    }



    private void persistSettings() {

    private void schedulePersistSettings() {

        if (mPersistSettingsScheduled.getAndSet(true)) {

            return;

        }

        IoThread.getHandler().post(() -> {

            mPersistSettingsScheduled.set(false);

            if (DEBUG) {

                Slog.d(TAG, "Writing overlay settings");

            }
@@ -1080,6 +1085,7 @@ public final class OverlayManagerService extends SystemService { 
                    Slog.e(TAG, "failed to persist overlay state", e);

                }

            }

        });

    }



    private void restoreSettings() {