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

Commit 81bd66a5 authored by Stevie Kideckel's avatar Stevie Kideckel Committed by Automerger Merge Worker
Browse files

Merge "Copy caches when initializing RemoteViews" into sc-v2-dev am: 45cf23a6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16422417

Change-Id: I965ad2bc3ddf198d96440b0a363a5fc76ea64be0
parents 6ed22d36 45cf23a6

core/java/android/widget/RemoteViews.java

+7 −4
Original line number Diff line number Diff line
@@ -3696,18 +3696,21 @@ public class RemoteViews implements Parcelable, Filter { 
    }



    private void initializeFrom(@NonNull RemoteViews src, @Nullable RemoteViews hierarchyRoot) {

        if (hierarchyRoot == null) {

            mBitmapCache = src.mBitmapCache;

            mApplicationInfoCache = src.mApplicationInfoCache;

        } else {

            mBitmapCache = hierarchyRoot.mBitmapCache;

            mApplicationInfoCache = hierarchyRoot.mApplicationInfoCache;

        }

        if (hierarchyRoot == null || src.mIsRoot) {

            // If there's no provided root, or if src was itself a root, then this RemoteViews is

            // the root of the new hierarchy.

            mIsRoot = true;

            mBitmapCache = new BitmapCache();

            mApplicationInfoCache = new ApplicationInfoCache();

            hierarchyRoot = this;

        } else {

            // Otherwise, we're a descendant in the hierarchy.

            mIsRoot = false;

            mBitmapCache = hierarchyRoot.mBitmapCache;

            mApplicationInfoCache = hierarchyRoot.mApplicationInfoCache;

        }

        mApplication = src.mApplication;

        mLayoutId = src.mLayoutId;