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

Commit 1784bcd3 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Write policy file less" into qt-qpr1-dev

am: a754ff10

Change-Id: I2c19718c0228a9445c34ca1567db0a2726fb01b4
parents e42e643e a754ff10
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
@@ -466,6 +466,8 @@ public class NotificationManagerService extends SystemService {
    private MetricsLogger mMetricsLogger;
    private TriPredicate<String, Integer, String> mAllowedManagedServicePackages;

    private final SavePolicyFileRunnable mSavePolicyFile = new SavePolicyFileRunnable();

    private static class Archive {
        final int mBufferSize;
        final ArrayDeque<StatusBarNotification> mBuffer;
@@ -659,7 +661,14 @@ public class NotificationManagerService extends SystemService {

    @VisibleForTesting
    protected void handleSavePolicyFile() {
        IoThread.getHandler().post(() -> {
        if (!IoThread.getHandler().hasCallbacks(mSavePolicyFile)) {
            IoThread.getHandler().post(mSavePolicyFile);
        }
    }

    private final class SavePolicyFileRunnable implements Runnable {
        @Override
        public void run() {
            if (DBG) Slog.d(TAG, "handleSavePolicyFile");
            synchronized (mPolicyFile) {
                final FileOutputStream stream;
@@ -679,7 +688,7 @@ public class NotificationManagerService extends SystemService {
                }
            }
            BackupManager.dataChanged(getContext().getPackageName());
        });
        }
    }

    private void writePolicyXml(OutputStream stream, boolean forBackup, int userId)