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

Commit 2e39f5c5 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "New ArrayMap class."

parents 9bc69f31 f4bf0ae2

core/java/android/app/LoaderManager.java

+2 −2
Original line number Diff line number Diff line
@@ -204,13 +204,13 @@ class LoaderManagerImpl extends LoaderManager { 
    // These are the currently active loaders.  A loader is here

    // from the time its load is started until it has been explicitly

    // stopped or restarted by the application.

    final SparseArray<LoaderInfo> mLoaders = new SparseArray<LoaderInfo>();

    final SparseArray<LoaderInfo> mLoaders = new SparseArray<LoaderInfo>(0);



    // These are previously run loaders.  This list is maintained internally

    // to avoid destroying a loader while an application is still using it.

    // It allows an application to restart a loader, but continue using its

    // previously run loader until the new loader's data is available.

    final SparseArray<LoaderInfo> mInactiveLoaders = new SparseArray<LoaderInfo>();

    final SparseArray<LoaderInfo> mInactiveLoaders = new SparseArray<LoaderInfo>(0);



    final String mWho;

core/java/android/content/pm/RegisteredServicesCache.java

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public abstract class RegisteredServicesCache<V> { 
    @GuardedBy("mServicesLock")

    private boolean mPersistentServicesFileDidNotExist;

    @GuardedBy("mServicesLock")

    private final SparseArray<UserServices<V>> mUserServices = new SparseArray<UserServices<V>>();

    private final SparseArray<UserServices<V>> mUserServices = new SparseArray<UserServices<V>>(2);



    private static class UserServices<V> {

        @GuardedBy("mServicesLock")

core/java/android/content/res/Resources.java

+3 −3
Original line number Diff line number Diff line
@@ -99,11 +99,11 @@ public class Resources { 
    /*package*/ final Configuration mTmpConfig = new Configuration();

    /*package*/ TypedValue mTmpValue = new TypedValue();

    /*package*/ final LongSparseArray<WeakReference<Drawable.ConstantState> > mDrawableCache

            = new LongSparseArray<WeakReference<Drawable.ConstantState> >();

            = new LongSparseArray<WeakReference<Drawable.ConstantState> >(0);

    /*package*/ final LongSparseArray<WeakReference<ColorStateList> > mColorStateListCache

            = new LongSparseArray<WeakReference<ColorStateList> >();

            = new LongSparseArray<WeakReference<ColorStateList> >(0);

    /*package*/ final LongSparseArray<WeakReference<Drawable.ConstantState> > mColorDrawableCache

            = new LongSparseArray<WeakReference<Drawable.ConstantState> >();

            = new LongSparseArray<WeakReference<Drawable.ConstantState> >(0);

    /*package*/ boolean mPreloading;



    /*package*/ TypedArray mCachedStyledAttributes = null;

core/java/android/util/ArrayMap.java

0 → 100644
+615 −0

File added.

Preview size limit exceeded, changes collapsed.

core/java/android/util/LongSparseArray.java

+11 −5

File changed.

Preview size limit exceeded, changes collapsed.