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

Commit fb654cf9 authored by Leon Scroggins's avatar Leon Scroggins Committed by Leon Scroggins III
Browse files

Revert "Better preload drawable logging" 

Bug: 63136392
Bug: 150395371
Test: make

This reverts commit 1480b676.

Bitmap moving into a new mainline module in S. These module-boundary-
crossing hidden APIs need to be either made official or removed.

We already got the information we need from this logging, so remove it
and the hidden APIs. If/when we need to investigate this in the future,
we should be able to recreate the logging without crossing the boundary.

Change-Id: I5d094a0e427d225719614745867d5b00888d8fec
parent 7d96ce57

core/java/android/content/res/ResourcesImpl.java

+0 −84
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.content.pm.ActivityInfo.Config; 
import android.content.res.AssetManager.AssetInputStream;

import android.content.res.Configuration.NativeConfig;

import android.content.res.Resources.NotFoundException;

import android.graphics.Bitmap;

import android.graphics.ImageDecoder;

import android.graphics.Typeface;

import android.graphics.drawable.ColorDrawable;
@@ -43,8 +42,6 @@ import android.graphics.drawable.DrawableContainer; 
import android.icu.text.PluralRules;

import android.os.Build;

import android.os.LocaleList;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.Trace;

import android.util.AttributeSet;

import android.util.DisplayMetrics;
@@ -83,22 +80,11 @@ public class ResourcesImpl { 
    private static final boolean DEBUG_LOAD = false;

    private static final boolean DEBUG_CONFIG = false;



    static final String TAG_PRELOAD = TAG + ".preload";



    @UnsupportedAppUsage

    private static final boolean TRACE_FOR_PRELOAD = false; // Do we still need it?

    @UnsupportedAppUsage

    private static final boolean TRACE_FOR_MISS_PRELOAD = false; // Do we still need it?



    public static final boolean TRACE_FOR_DETAILED_PRELOAD =

            SystemProperties.getBoolean("debug.trace_resource_preload", false);



    /** Used only when TRACE_FOR_DETAILED_PRELOAD is true. */

    private static int sPreloadTracingNumLoadedDrawables;

    private long mPreloadTracingPreloadStartTime;

    private long mPreloadTracingStartBitmapSize;

    private long mPreloadTracingStartBitmapCount;



    private static final int ID_OTHER = 0x01000004;



    private static final Object sSync = new Object();
@@ -658,16 +644,6 @@ public class ResourcesImpl { 
            Drawable dr;

            boolean needsNewDrawableAfterCache = false;

            if (cs != null) {

                if (TRACE_FOR_DETAILED_PRELOAD) {

                    // Log only framework resources

                    if (((id >>> 24) == 0x1) && (android.os.Process.myUid() != 0)) {

                        final String name = getResourceName(id);

                        if (name != null) {

                            Log.d(TAG_PRELOAD, "Hit preloaded FW drawable #"

                                    + Integer.toHexString(id) + " " + name);

                        }

                    }

                }

                dr = cs.newDrawable(wrapper);

            } else if (isColorDrawable) {

                dr = new ColorDrawable(value.data);
@@ -864,18 +840,6 @@ public class ResourcesImpl { 
            }

        }



        // For preload tracing.

        long startTime = 0;

        int startBitmapCount = 0;

        long startBitmapSize = 0;

        int startDrawableCount = 0;

        if (TRACE_FOR_DETAILED_PRELOAD) {

            startTime = System.nanoTime();

            startBitmapCount = Bitmap.sPreloadTracingNumInstantiatedBitmaps;

            startBitmapSize = Bitmap.sPreloadTracingTotalBitmapsSize;

            startDrawableCount = sPreloadTracingNumLoadedDrawables;

        }



        if (DEBUG_LOAD) {

            Log.v(TAG, "Loading drawable for cookie " + value.assetCookie + ": " + file);

        }
@@ -921,37 +885,6 @@ public class ResourcesImpl { 
        }

        Trace.traceEnd(Trace.TRACE_TAG_RESOURCES);



        if (TRACE_FOR_DETAILED_PRELOAD) {

            if (((id >>> 24) == 0x1)) {

                final String name = getResourceName(id);

                if (name != null) {

                    final long time = System.nanoTime() - startTime;

                    final int loadedBitmapCount =

                            Bitmap.sPreloadTracingNumInstantiatedBitmaps - startBitmapCount;

                    final long loadedBitmapSize =

                            Bitmap.sPreloadTracingTotalBitmapsSize - startBitmapSize;

                    final int loadedDrawables =

                            sPreloadTracingNumLoadedDrawables - startDrawableCount;



                    sPreloadTracingNumLoadedDrawables++;



                    final boolean isRoot = (android.os.Process.myUid() == 0);



                    Log.d(TAG_PRELOAD,

                            (isRoot ? "Preloaded FW drawable #"

                                    : "Loaded non-preloaded FW drawable #")

                            + Integer.toHexString(id)

                            + " " + name

                            + " " + file

                            + " " + dr.getClass().getCanonicalName()

                            + " #nested_drawables= " + loadedDrawables

                            + " #bitmaps= " + loadedBitmapCount

                            + " total_bitmap_size= " + loadedBitmapSize

                            + " in[us] " + (time / 1000));

                }

            }

        }



        return dr;

    }
@@ -1312,13 +1245,6 @@ public class ResourcesImpl { 
            mPreloading = true;

            mConfiguration.densityDpi = DisplayMetrics.DENSITY_DEVICE;

            updateConfiguration(null, null, null);



            if (TRACE_FOR_DETAILED_PRELOAD) {

                mPreloadTracingPreloadStartTime = SystemClock.uptimeMillis();

                mPreloadTracingStartBitmapSize = Bitmap.sPreloadTracingTotalBitmapsSize;

                mPreloadTracingStartBitmapCount = Bitmap.sPreloadTracingNumInstantiatedBitmaps;

                Log.d(TAG_PRELOAD, "Preload starting");

            }

        }

    }
@@ -1328,16 +1254,6 @@ public class ResourcesImpl { 
     */

    void finishPreloading() {

        if (mPreloading) {

            if (TRACE_FOR_DETAILED_PRELOAD) {

                final long time = SystemClock.uptimeMillis() - mPreloadTracingPreloadStartTime;

                final long size =

                        Bitmap.sPreloadTracingTotalBitmapsSize - mPreloadTracingStartBitmapSize;

                final long count = Bitmap.sPreloadTracingNumInstantiatedBitmaps

                        - mPreloadTracingStartBitmapCount;

                Log.d(TAG_PRELOAD, "Preload finished, "

                        + count + " bitmaps of " + size + " bytes in " + time + " ms");

            }



            mPreloading = false;

            flushLayoutCache();

        }

graphics/java/android/graphics/Bitmap.java

+0 −13
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.WorkerThread;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.res.ResourcesImpl;

import android.hardware.HardwareBuffer;

import android.os.Build;

import android.os.Parcel;
@@ -95,12 +94,6 @@ public final class Bitmap implements Parcelable { 


    private static volatile int sDefaultDensity = -1;



    /** @hide Used only when ResourcesImpl.TRACE_FOR_DETAILED_PRELOAD is true. */

    public static volatile int sPreloadTracingNumInstantiatedBitmaps;



    /** @hide Used only when ResourcesImpl.TRACE_FOR_DETAILED_PRELOAD is true. */

    public static volatile long sPreloadTracingTotalBitmapsSize;



    /**

     * For backwards compatibility, allows the app layer to change the default

     * density when running old apps.
@@ -164,12 +157,6 @@ public final class Bitmap implements Parcelable { 
                    Bitmap.class.getClassLoader(), nativeGetNativeFinalizer(), allocationByteCount);

        }

        registry.registerNativeAllocation(this, nativeBitmap);



        if (ResourcesImpl.TRACE_FOR_DETAILED_PRELOAD) {

            sPreloadTracingNumInstantiatedBitmaps++;

            long nativeSize = NATIVE_ALLOCATION_SIZE + allocationByteCount;

            sPreloadTracingTotalBitmapsSize += nativeSize;

        }

    }



    /**