diff options
author | Ryan Mitchell <rtmitchell@google.com> | 2020-03-27 09:33:31 -0700 |
---|---|---|
committer | Ryan Mitchell <rtmitchell@google.com> | 2020-03-27 10:32:52 -0700 |
commit | 26ff673458c6b85ecfc9628cf6bd7522c8393d0f (patch) | |
tree | cac4695da2dba020a547b3234e30e933b6e60eb8 /graphics | |
parent | 393c9121cea9e03762b3e5460d523b9d5393f6f7 (diff) |
Add mSourceDrawableId to copy constructor
The copy constructor of AdaptiveIconDrawable#LayerState currently does
not copy mSourceDrawableId from the original layer state. This prevents
drawables created from preloaded AdaptiveIconDrawables from having the
correct source drawable resource id.
Bug: 148488431
Test: CtsContentTestCases:android.content.pm.cts.PackageManagerTest
Change-Id: I7795a337a2a364677e375776c7aec5bc9189e0da
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java index 746378e10bc7..31ad81b9c346 100644 --- a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java +++ b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java @@ -975,6 +975,7 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback mChangingConfigurations = orig.mChangingConfigurations; mChildrenChangingConfigurations = orig.mChildrenChangingConfigurations; + mSourceDrawableId = orig.mSourceDrawableId; for (int i = 0; i < N_CHILDREN; i++) { final ChildDrawable or = origChildDrawable[i]; |