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

Commit 6e69995f authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

Remove GarbageMonitorModule 

This module is not in use as it was providing bad data.

Fixes: 237065162
Fixes: 243569195
Test: build
Test: atest com.android.systemui.qs
Flag: None

Change-Id: I6fd106b1aea2cb3733c366c758463d50d8faa0d7
parent 66d088a2

packages/SystemUI/res/drawable/ic_memory.xml

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<!--

Copyright (C) 2018 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M16.0,5.0l-8.0,0.0l0.0,14.0l8.0,0.0z"

        android:fillAlpha="0.5"

        android:fillColor="#000000"/>

    <path

        android:pathData="M6,9 L6,7 L4,7 L4,5 L6,5 C6,3.9 6.9,3 8,3 L16,3 C17.1,3 18,3.9 18,5 L20,5 L20,7 L18,7 L18,9 L20,9 L20,11 L18,11 L18,13 L20,13 L20,15 L18,15 L18,17 L20,17 L20,19 L18,19 C18,20.1 17.1,21 16,21 L8,21 C6.9,21 6,20.1 6,19 L4,19 L4,17 L6,17 L6,15 L4,15 L4,13 L6,13 L6,11 L4,11 L4,9 L6,9 Z M16,19 L16,5 L8,5 L8,19 L16,19 Z"

        android:fillColor="#000000"/>

</vector>

packages/SystemUI/res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -480,9 +480,6 @@ 
     This name is in the ComponentName flattened format (package/class)  -->

    <string name="config_remoteCopyPackage" translatable="false"></string>



    <!-- On debuggable builds, alert the user if SystemUI PSS goes over this number (in kb) -->

    <integer name="watch_heap_limit">256000</integer>



    <!-- SystemUI Plugins that can be loaded on user builds. -->

    <string-array name="config_pluginAllowlist" translatable="false">

        <item>com.android.systemui</item>

packages/SystemUI/res/values/strings.xml

+0 −4
Original line number Diff line number Diff line
@@ -2397,10 +2397,6 @@ 
    <!-- URl of the webpage that explains battery saver. -->

    <string name="help_uri_battery_saver_learn_more_link_target" translatable="false"></string>



    <!-- Name for a quick settings tile, used only by platform developers, to extract the SystemUI process memory and send it to another

         app for debugging. Will not be seen by users. [CHAR LIMIT=20] -->

    <string name="heap_dump_tile_name">Dump SysUI Heap</string>



    <!-- Title for the privacy indicators dialog, only appears as part of a11y descriptions [CHAR LIMIT=NONE] -->

    <string name="ongoing_privacy_dialog_a11y_title">In use</string>

packages/SystemUI/src/com/android/systemui/qs/QSHost.java

+1 −7
Original line number Diff line number Diff line
@@ -17,12 +17,10 @@ package com.android.systemui.qs; 
import android.content.ComponentName;

import android.content.Context;

import android.content.res.Resources;

import android.os.Build;

import android.provider.Settings;



import com.android.systemui.res.R;

import com.android.systemui.plugins.qs.QSTile;

import com.android.systemui.util.leak.GarbageMonitor;

import com.android.systemui.res.R;



import java.util.ArrayList;

import java.util.Arrays;
@@ -44,10 +42,6 @@ public interface QSHost { 
        final String defaultTileList = res.getString(R.string.quick_settings_tiles_default);



        tiles.addAll(Arrays.asList(defaultTileList.split(",")));

        if (Build.IS_DEBUGGABLE

                && GarbageMonitor.ADD_MEMORY_TILE_TO_DEFAULT_ON_DEBUGGABLE_BUILDS) {

            tiles.add(GarbageMonitor.MemoryTile.TILE_SPEC);

        }

        return tiles;

    }

packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java

+1 −6
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.Intent; 
import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.graphics.drawable.Drawable;

import android.os.Build;

import android.provider.Settings;

import android.service.quicksettings.Tile;

import android.service.quicksettings.TileService;
@@ -33,7 +32,6 @@ import android.widget.Button; 


import androidx.annotation.Nullable;



import com.android.systemui.res.R;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.plugins.qs.QSTile;
@@ -42,8 +40,8 @@ import com.android.systemui.qs.QSHost; 
import com.android.systemui.qs.dagger.QSScope;

import com.android.systemui.qs.external.CustomTile;

import com.android.systemui.qs.tileimpl.QSTileImpl.DrawableIcon;

import com.android.systemui.res.R;

import com.android.systemui.settings.UserTracker;

import com.android.systemui.util.leak.GarbageMonitor;



import java.util.ArrayList;

import java.util.Arrays;
@@ -114,9 +112,6 @@ public class TileQueryHelper { 
                possibleTiles.add(spec);

            }

        }

        if (Build.IS_DEBUGGABLE && !current.contains(GarbageMonitor.MemoryTile.TILE_SPEC)) {

            possibleTiles.add(GarbageMonitor.MemoryTile.TILE_SPEC);

        }



        final ArrayList<QSTile> tilesToAdd = new ArrayList<>();

        possibleTiles.remove("cell");