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

Commit aab43403 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Fix synchronization on DND settings 

Test: ZenModeHelperTest, NotificationManagerTest, manually &
automatically exercise DND
Fixes: 224679627

Change-Id: If1b9ab80979ce6060d4ee2035f680869f33a96c1
parent 6117e9ff

services/core/java/com/android/server/notification/ZenModeHelper.java

+26 −10
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ public class ZenModeHelper { 
    protected final RingerModeDelegate mRingerModeDelegate = new

            RingerModeDelegate();

    @VisibleForTesting protected final ZenModeConditions mConditions;

    Object mConfigsLock = new Object();

    @VisibleForTesting final SparseArray<ZenModeConfig> mConfigs = new SparseArray<>();

    private final Metrics mMetrics = new Metrics();

    private final ConditionProviders.Config mServiceConfig;
@@ -153,7 +154,9 @@ public class ZenModeHelper { 
        mDefaultConfig = readDefaultConfig(mContext.getResources());

        updateDefaultAutomaticRuleNames();

        mConfig = mDefaultConfig.copy();

        synchronized (mConfigsLock) {

            mConfigs.put(UserHandle.USER_SYSTEM, mConfig);

        }

        mConsolidatedPolicy = mConfig.toNotificationPolicy();



        mSettingsObserver = new SettingsObserver(mHandler);
@@ -233,8 +236,10 @@ public class ZenModeHelper { 
    public void onUserRemoved(int user) {

        if (user < UserHandle.USER_SYSTEM) return;

        if (DEBUG) Log.d(TAG, "onUserRemoved u=" + user);

        synchronized (mConfigsLock) {

            mConfigs.remove(user);

        }

    }



    public void onUserUnlocked(int user) {

        loadConfigForUser(user, "onUserUnlocked");
@@ -248,7 +253,12 @@ public class ZenModeHelper { 
        if (mUser == user || user < UserHandle.USER_SYSTEM) return;

        mUser = user;

        if (DEBUG) Log.d(TAG, reason + " u=" + user);

        ZenModeConfig config = mConfigs.get(user);

        ZenModeConfig config = null;

        synchronized (mConfigsLock) {

            if (mConfigs.get(user) != null) {

                config = mConfigs.get(user).copy();

            }

        }

        if (config == null) {

            if (DEBUG) Log.d(TAG, reason + " generating default config for user " + user);

            config = mDefaultConfig.copy();
@@ -685,10 +695,12 @@ public class ZenModeHelper { 
        pw.println(Global.zenModeToString(mZenMode));

        pw.print(prefix);

        pw.println("mConsolidatedPolicy=" + mConsolidatedPolicy.toString());

        synchronized(mConfigsLock) {

            final int N = mConfigs.size();

            for (int i = 0; i < N; i++) {

                dump(pw, prefix, "mConfigs[u=" + mConfigs.keyAt(i) + "]", mConfigs.valueAt(i));

            }

        }

        pw.print(prefix); pw.print("mUser="); pw.println(mUser);

        synchronized (mConfig) {

            dump(pw, prefix, "mConfig", mConfig);
@@ -787,7 +799,7 @@ public class ZenModeHelper { 


    public void writeXml(TypedXmlSerializer out, boolean forBackup, Integer version, int userId)

            throws IOException {

        synchronized (mConfigs) {

        synchronized (mConfigsLock) {

            final int n = mConfigs.size();

            for (int i = 0; i < n; i++) {

                if (forBackup && mConfigs.keyAt(i) != userId) {
@@ -883,14 +895,18 @@ public class ZenModeHelper { 
            }

            if (config.user != mUser) {

                // simply store away for background users

                synchronized (mConfigsLock) {

                    mConfigs.put(config.user, config);

                }

                if (DEBUG) Log.d(TAG, "setConfigLocked: store config for user " + config.user);

                return true;

            }

            // handle CPS backed conditions - danger! may modify config

            mConditions.evaluateConfig(config, null, false /*processSubscriptions*/);



            synchronized (mConfigsLock) {

                mConfigs.put(config.user, config);

            }

            if (DEBUG) Log.d(TAG, "setConfigLocked reason=" + reason, new Throwable());

            ZenLog.traceConfig(reason, mConfig, config);
@@ -1211,7 +1227,7 @@ public class ZenModeHelper { 
     * Generate pulled atoms about do not disturb configurations.

     */

    public void pullRules(List<StatsEvent> events) {

        synchronized (mConfig) {

        synchronized (mConfigsLock) {

            final int numConfigs = mConfigs.size();

            for (int i = 0; i < numConfigs; i++) {

                final int user = mConfigs.keyAt(i);