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

Commit 63ae85f0 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 42ef77f3: merge from open-source master 

Merge commit '42ef77f3'

* commit '42ef77f3':
  Shoud specify the Resource class instance as an argument of the method
parents 57339e75 42ef77f3

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

+4 −4
Original line number Diff line number Diff line
@@ -1345,8 +1345,8 @@ public class Resources { 
                    keyboardHidden, mConfiguration.navigation, width, height,

                    mConfiguration.screenLayout, mConfiguration.uiMode, sSdkVersion);



            drawableCacheClear(mDrawableCache, configChanges);

            drawableCacheClear(mColorDrawableCache, configChanges);

            clearDrawableCache(mDrawableCache, configChanges);

            clearDrawableCache(mColorDrawableCache, configChanges);



            mColorStateListCache.clear();
@@ -1360,7 +1360,7 @@ public class Resources { 
        }

    }



    private void drawableCacheClear(

    private void clearDrawableCache(

            LongSparseArray<WeakReference<ConstantState>> cache,

            int configChanges) {

        int N = cache.size();
@@ -1821,7 +1821,7 @@ public class Resources { 
                    //Log.i(TAG, "Returning cached drawable @ #" +

                    //        Integer.toHexString(((Integer)key).intValue())

                    //        + " in " + this + ": " + entry);

                    return entry.newDrawable();

                    return entry.newDrawable(this);

                }

                else {  // our entry has been purged

                    drawableCache.delete(key);