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

Commit da541fc4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove PointerIcon frame size checks for animated drawables" into main am: 56645753 

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



Change-Id: I1450817c35f8a8f27eae435bea335b8078e97ded
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4dfd8d19 56645753

core/java/android/view/PointerIcon.java

+0 −8
Original line number Diff line number Diff line
@@ -521,8 +521,6 @@ public final class PointerIcon implements Parcelable { 
                // Assumes they have the exact duration.

                mDurationPerFrame = animationDrawable.getDuration(0);

                mBitmapFrames = new Bitmap[frames - 1];

                final int width = drawable.getIntrinsicWidth();

                final int height = drawable.getIntrinsicHeight();

                final boolean isVectorAnimation = drawable instanceof VectorDrawable;

                mDrawNativeDropShadow = isVectorAnimation;

                for (int i = 1; i < frames; ++i) {
@@ -537,12 +535,6 @@ public final class PointerIcon implements Parcelable { 
                                + "is a different type from the others. All frames should be the "

                                + "same type.");

                    }

                    if (drawableFrame.getIntrinsicWidth() != width ||

                        drawableFrame.getIntrinsicHeight() != height) {

                        throw new IllegalArgumentException("The bitmap size of " + i + "-th frame "

                                + "is different. All frames should have the exact same size and "

                                + "share the same hotspot.");

                    }

                    if (isVectorAnimation) {

                        drawableFrame = getBitmapDrawableFromVectorDrawable(resources,

                                (VectorDrawable) drawableFrame, pointerScale);