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

Commit 8984c11c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't create copies of Icon bitmaps for Smartspace" into udc-dev

parents 9fda153a 55d75ec7

core/java/android/app/smartspace/SmartspaceAction.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -348,6 +348,10 @@ public final class SmartspaceAction implements Parcelable { 
         */

         */

        @NonNull

        @NonNull

        public SmartspaceAction build() {

        public SmartspaceAction build() {

            if (mIcon != null) {

                mIcon.convertToAshmem();

            }



            return new SmartspaceAction(mId, mIcon, mTitle, mSubtitle, mContentDescription,

            return new SmartspaceAction(mId, mIcon, mTitle, mSubtitle, mContentDescription,

                    mPendingIntent, mIntent, mUserHandle, mExtras);

                    mPendingIntent, mIntent, mUserHandle, mExtras);

        }

        }

core/java/android/app/smartspace/uitemplatedata/Icon.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -171,6 +171,7 @@ public final class Icon implements Parcelable { 
         */

         */

        @NonNull

        @NonNull

        public Icon build() {

        public Icon build() {

            mIcon.convertToAshmem();

            return new Icon(mIcon, mContentDescription, mShouldTint);

            return new Icon(mIcon, mContentDescription, mShouldTint);

        }

        }

    }

    }