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

Commit 26ff6734 authored by Ryan Mitchell's avatar Ryan Mitchell
Browse files

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
parent 393c9121

graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java

+1 −0
Original line number Diff line number Diff line
@@ -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];