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

Commit 11ed11b9 authored by Siim Sammul's avatar Siim Sammul Committed by Automerger Merge Worker
Browse files

Merge "Disable wtf dropbox entries by default." into udc-dev am: bf1e1425 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21606059



Change-Id: I5d301c7628e948177772febd601adda00e1adc85
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89dd5954 bf1e1425

services/core/java/com/android/server/DropBoxManagerService.java

+11 −1
Original line number Original line Diff line number Diff line
@@ -79,6 +79,7 @@ import java.io.InputStreamReader; 
import java.io.PrintWriter;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Arrays;

import java.util.List;

import java.util.SortedSet;

import java.util.SortedSet;

import java.util.TreeSet;

import java.util.TreeSet;

import java.util.zip.GZIPOutputStream;

import java.util.zip.GZIPOutputStream;
@@ -105,6 +106,10 @@ public final class DropBoxManagerService extends SystemService { 
    // Size beyond which to force-compress newly added entries.

    // Size beyond which to force-compress newly added entries.

    private static final long COMPRESS_THRESHOLD_BYTES = 16_384;

    private static final long COMPRESS_THRESHOLD_BYTES = 16_384;





    // Tags that we should drop by default.

    private static final List<String> DISABLED_BY_DEFAULT_TAGS =

            List.of("data_app_wtf", "system_app_wtf", "system_server_wtf");



    // TODO: This implementation currently uses one file per entry, which is

    // TODO: This implementation currently uses one file per entry, which is

    // inefficient for smallish entries -- consider using a single queue file

    // inefficient for smallish entries -- consider using a single queue file

    // per tag (or even globally) instead.

    // per tag (or even globally) instead.
@@ -549,8 +554,13 @@ public final class DropBoxManagerService extends SystemService { 
    public boolean isTagEnabled(String tag) {

    public boolean isTagEnabled(String tag) {

        final long token = Binder.clearCallingIdentity();

        final long token = Binder.clearCallingIdentity();

        try {

        try {

            if (DISABLED_BY_DEFAULT_TAGS.contains(tag)) {

                return "enabled".equals(Settings.Global.getString(

                    mContentResolver, Settings.Global.DROPBOX_TAG_PREFIX + tag));

            } else {

                return !"disabled".equals(Settings.Global.getString(

                return !"disabled".equals(Settings.Global.getString(

                    mContentResolver, Settings.Global.DROPBOX_TAG_PREFIX + tag));

                    mContentResolver, Settings.Global.DROPBOX_TAG_PREFIX + tag));

            }

        } finally {

        } finally {

            Binder.restoreCallingIdentity(token);

            Binder.restoreCallingIdentity(token);

        }

        }