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

Commit 5a586529 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I951c0f60,Iabfd62ba 

* changes:
  Add safety checks for MessagingPool and other view reuse conditions
  Disable pooling of MessagingGroup and MessagingMessage instances.
parents 79779fcb 33d97893

core/java/com/android/internal/widget/ConversationLayout.java

+4 −0
Original line number Diff line number Diff line
@@ -871,6 +871,10 @@ public class ConversationLayout extends FrameLayout 
            if (newGroup == null) {

                newGroup = MessagingGroup.createGroup(mMessagingLinearLayout);

                mAddedGroups.add(newGroup);

            } else if (newGroup.getParent() != mMessagingLinearLayout) {

                throw new IllegalStateException(

                        "group parent was " + newGroup.getParent() + " but expected "

                                + mMessagingLinearLayout);

            }

            newGroup.setImageDisplayLocation(mIsCollapsed

                    ? IMAGE_DISPLAY_LOCATION_EXTERNAL

core/java/com/android/internal/widget/MessagingGroup.java

+3 −4
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.graphics.drawable.Icon; 
import android.text.TextUtils;

import android.util.AttributeSet;

import android.util.DisplayMetrics;

import android.util.Pools;

import android.util.TypedValue;

import android.view.LayoutInflater;

import android.view.View;
@@ -57,8 +56,8 @@ import java.util.List; 
 */

@RemoteViews.RemoteView

public class MessagingGroup extends LinearLayout implements MessagingLinearLayout.MessagingChild {

    private static Pools.SimplePool<MessagingGroup> sInstancePool

            = new Pools.SynchronizedPool<>(10);

    private static final MessagingPool<MessagingGroup> sInstancePool =

            new MessagingPool<>(10);



    /**

     * Images are displayed inline.
@@ -338,7 +337,7 @@ public class MessagingGroup extends LinearLayout implements MessagingLinearLayou 
    }



    public static void dropCache() {

        sInstancePool = new Pools.SynchronizedPool<>(10);

        sInstancePool.clear();

    }



    @Override

core/java/com/android/internal/widget/MessagingImageMessage.java

+3 −4
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.graphics.drawable.Drawable; 
import android.net.Uri;

import android.util.AttributeSet;

import android.util.Log;

import android.util.Pools;

import android.view.LayoutInflater;

import android.view.ViewGroup;

import android.widget.ImageView;
@@ -44,8 +43,8 @@ import java.io.IOException; 
@RemoteViews.RemoteView

public class MessagingImageMessage extends ImageView implements MessagingMessage {

    private static final String TAG = "MessagingImageMessage";

    private static Pools.SimplePool<MessagingImageMessage> sInstancePool

            = new Pools.SynchronizedPool<>(10);

    private static final MessagingPool<MessagingImageMessage> sInstancePool =

            new MessagingPool<>(10);

    private final MessagingMessageState mState = new MessagingMessageState(this);

    private final int mMinImageHeight;

    private final Path mPath = new Path();
@@ -194,7 +193,7 @@ public class MessagingImageMessage extends ImageView implements MessagingMessage 
    }



    public static void dropCache() {

        sInstancePool = new Pools.SynchronizedPool<>(10);

        sInstancePool.clear();

    }



    @Override

core/java/com/android/internal/widget/MessagingLayout.java

+4 −0
Original line number Diff line number Diff line
@@ -419,6 +419,10 @@ public class MessagingLayout extends FrameLayout 
            if (newGroup == null) {

                newGroup = MessagingGroup.createGroup(mMessagingLinearLayout);

                mAddedGroups.add(newGroup);

            } else if (newGroup.getParent() != mMessagingLinearLayout) {

                throw new IllegalStateException(

                        "group parent was " + newGroup.getParent() + " but expected "

                                + mMessagingLinearLayout);

            }

            newGroup.setImageDisplayLocation(mIsCollapsed

                    ? IMAGE_DISPLAY_LOCATION_EXTERNAL

core/java/com/android/internal/widget/MessagingPool.java

0 → 100644
+73 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.

 */



package com.android.internal.widget;



import android.util.Log;

import android.util.Pools;

import android.view.View;



/**

 * A trivial wrapper around Pools.SynchronizedPool which allows clearing the pool, as well as

 * disabling the pool class altogether.

 * @param <T> the type of object in the pool

 */

public class MessagingPool<T extends View> implements Pools.Pool<T> {

    private static final boolean ENABLED = false;  // disabled to test b/208508846

    private static final String TAG = "MessagingPool";

    private final int mMaxPoolSize;

    private Pools.SynchronizedPool<T> mCurrentPool;



    public MessagingPool(int maxPoolSize) {

        mMaxPoolSize = maxPoolSize;

        if (ENABLED) {

            mCurrentPool = new Pools.SynchronizedPool<>(mMaxPoolSize);

        }

    }



    @Override

    public T acquire() {

        if (!ENABLED) {

            return null;

        }

        T instance = mCurrentPool.acquire();

        if (instance.getParent() != null) {

            Log.wtf(TAG, "acquired " + instance + " with parent " + instance.getParent());

            return null;

        }

        return instance;

    }



    @Override

    public boolean release(T instance) {

        if (instance.getParent() != null) {

            Log.wtf(TAG, "releasing " + instance + " with parent " + instance.getParent());

            return false;

        }

        if (!ENABLED) {

            return false;

        }

        return mCurrentPool.release(instance);

    }



    /** Clear the pool */

    public void clear() {

        if (ENABLED) {

            mCurrentPool = new Pools.SynchronizedPool<>(mMaxPoolSize);

        }

    }



}