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

Commit 5a2f463f authored by Romain Guy's avatar Romain Guy Committed by The Android Open Source Project
Browse files

Merge branch 'readonly-p4-master'

parents ffe5e108 10b4043c

core/java/android/util/PoolFactory.java→core/java/android/util/Pools.java

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package android.util; 
/**

 * @hide

 */

public class PoolFactory {

    private PoolFactory() {

public class Pools {

    private Pools() {

    }



    public static <T extends Poolable<T>> Pool<T> simplePool(PoolableManager<T> manager) {

core/java/android/view/VelocityTracker.java

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.util.Config; 
import android.util.Log;

import android.util.Poolable;

import android.util.Pool;

import android.util.PoolFactory;

import android.util.Pools;

import android.util.PoolableManager;



/**
@@ -41,8 +41,8 @@ public final class VelocityTracker implements Poolable<VelocityTracker> { 
    static final int LONGEST_PAST_TIME = 200;



    static final VelocityTracker[] mPool = new VelocityTracker[1];

    private static final Pool<VelocityTracker> sPool = PoolFactory.synchronizedPool(

            PoolFactory.finitePool(new PoolableManager<VelocityTracker>() {

    private static final Pool<VelocityTracker> sPool = Pools.synchronizedPool(

            Pools.finitePool(new PoolableManager<VelocityTracker>() {

                public VelocityTracker newInstance() {

                    return new VelocityTracker();

                }

core/java/android/view/View.java

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ import android.util.Log; 
import android.util.SparseArray;

import android.util.Poolable;

import android.util.Pool;

import android.util.PoolFactory;

import android.util.Pools;

import android.util.PoolableManager;

import android.view.ContextMenu.ContextMenuInfo;

import android.view.animation.Animation;
@@ -7890,8 +7890,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback { 
         */

        static class InvalidateInfo implements Poolable<InvalidateInfo> {

            private static final int POOL_LIMIT = 10;

            private static final Pool<InvalidateInfo> sPool = PoolFactory.synchronizedPool(

                    PoolFactory.finitePool(new PoolableManager<InvalidateInfo>() {

            private static final Pool<InvalidateInfo> sPool = Pools.synchronizedPool(

                    Pools.finitePool(new PoolableManager<InvalidateInfo>() {

                        public InvalidateInfo newInstance() {

                            return new InvalidateInfo();

                        }