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

Commit 3da6b180 authored by Mayank Dandwani's avatar Mayank Dandwani Committed by mayankkk
Browse files

Revert "Include sticky broadcast cache in the processes dump." 

This reverts commit 1af6e1ac.

Reason for revert: Doing caching using IPCDataCache

Change-Id: Idb5a6185f0de3ec68abee70283d527073b1d98cd
parent 709cf957

core/java/android/app/ActivityThread.java

+2 −6
Original line number Diff line number Diff line
@@ -1961,13 +1961,9 @@ public final class ActivityThread extends ClientTransactionHandler 


        @Override

        public void dumpCacheInfo(ParcelFileDescriptor pfd, String[] args) {

            try {

            PropertyInvalidatedCache.dumpCacheInfo(pfd, args);

                BroadcastStickyCache.dump(pfd);

            } finally {

            IoUtils.closeQuietly(pfd);

        }

        }



        private File getDatabasesDir(Context context) {

            // There's no simple way to get the databases/ path, so do it this way.

core/java/android/app/BroadcastStickyCache.java

+0 −40
Original line number Diff line number Diff line
@@ -27,21 +27,16 @@ import android.net.TetheringManager; 
import android.net.nsd.NsdManager;

import android.net.wifi.WifiManager;

import android.net.wifi.p2p.WifiP2pManager;

import android.os.ParcelFileDescriptor;

import android.os.SystemProperties;

import android.os.UpdateLock;

import android.telephony.TelephonyManager;

import android.util.ArrayMap;

import android.util.IndentingPrintWriter;

import android.view.WindowManagerPolicyConstants;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.FastPrintWriter;



import java.io.FileOutputStream;

import java.io.PrintWriter;

import java.util.ArrayList;



/** @hide */
@@ -219,41 +214,6 @@ public class BroadcastStickyCache { 
        }

    }



    public static void dump(@NonNull ParcelFileDescriptor pfd) {

        if (!Flags.useStickyBcastCache()) {

            return;

        }

        final PrintWriter pw = new FastPrintWriter(new FileOutputStream(pfd.getFileDescriptor()));

        synchronized (sCachedStickyBroadcasts) {

            dumpLocked(pw);

        }

        pw.flush();

    }



    @GuardedBy("sCachedStickyBroadcasts")

    private static void dumpLocked(@NonNull PrintWriter pw) {

        final IndentingPrintWriter ipw = new IndentingPrintWriter(

                pw, "  " /* singleIndent */, "  " /* prefix */);

        ipw.println("Cached sticky broadcasts:");

        ipw.increaseIndent();

        final int count = sCachedStickyBroadcasts.size();

        if (count == 0) {

            ipw.println("<empty>");

        } else {

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

                final CachedStickyBroadcast cachedStickyBroadcast = sCachedStickyBroadcasts.get(i);

                ipw.print("Entry #"); ipw.print(i); ipw.println(":");

                ipw.increaseIndent();

                ipw.print("filter="); ipw.println(cachedStickyBroadcast.filter.toLongString());

                ipw.print("intent="); ipw.println(cachedStickyBroadcast.intent);

                ipw.print("version="); ipw.println(cachedStickyBroadcast.version);

                ipw.print("handle="); ipw.println(cachedStickyBroadcast.propertyHandle);

                ipw.decreaseIndent();

            }

        }

        ipw.decreaseIndent();

    }



    private static final class CachedStickyBroadcast {

        @NonNull public final IntentFilter filter;

        @Nullable public Intent intent;